From ade52dd5c0c25d3cc64e04c284eb59317acf1824 Mon Sep 17 00:00:00 2001
From: putuwahyu29 <iputuagus.wahyu@gmail.com>
Date: Thu, 30 Jan 2025 13:49:08 +0700
Subject: [PATCH 01/95] Adding the Resend Platform Email Configuration

---
 .env.local.example          | 1 +
 README.md                   | 1 +
 lib/actions/auth.ts         | 2 +-
 lib/actions/collaborator.ts | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.env.local.example b/.env.local.example
index f70c69a9..d0f8b036 100644
--- a/.env.local.example
+++ b/.env.local.example
@@ -7,6 +7,7 @@ xxx
 GITHUB_APP_WEBHOOK_SECRET="another-random-string-of-characters"
 GITHUB_APP_CLIENT_ID="your-github-app-client-id"
 GITHUB_APP_CLIENT_SECRET="your-github-app-client-secret"
+RESEND_DOMAIN_EMAIL ="your-domain-email"
 RESEND_API_KEY="your-resend-api-key"
 SQLITE_URL="file:./local.db"
 # SQLITE_AUTH_TOKEN=""
diff --git a/README.md b/README.md
index c6b3d3f6..948ecf14 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,7 @@ Variable | Comments
 `GITHUB_APP_WEBHOOK_SECRET` | The secret you picked for your webhook. This is used to ensure the request is coming from GitHub.
 `GITHUB_APP_CLIENT_ID` | GitHub App Client ID from your GitHub App details page.
 `GITHUB_APP_CLIENT_SECRET` | GitHub App Client Secret you generate on theGitHub App details page.
+`RESEND_DOMAIN_EMAIL` | The domain email you use for your Resend account.
 `RESEND_API_KEY` | You'll get that when you create a (free) [Resend](https://resend.com) account to handle emails.
 `SQLITE_URL` | `file:./local.db` for development, `libsql://pages-cms-username.turso.io` for example if you use [Turso](https://turso.tech) (you should, Turso is great).
 `SQLITE_AUTH_TOKEN` | Leave blank for development, otherwise use the token provided by [Turso](https://turso.tech) (if that's what you use).
diff --git a/lib/actions/auth.ts b/lib/actions/auth.ts
index b316678f..761633f3 100644
--- a/lib/actions/auth.ts
+++ b/lib/actions/auth.ts
@@ -45,7 +45,7 @@ const handleEmailSignIn = async (prevState: any, formData: FormData) => {
 	const resend = new Resend(process.env.RESEND_API_KEY);
 
 	const { data, error } = await resend.emails.send({
-		from: "Pages CMS <no-reply@mail.pagescms.org>",
+		from: `Pages CMS <${process.env.RESEND_DOMAIN_EMAIL}>`,
 		to: [email],
 		subject: "Sign in link for Pages CMS",
 		react: LoginEmailTemplate({
diff --git a/lib/actions/collaborator.ts b/lib/actions/collaborator.ts
index ac60a566..80f89f16 100644
--- a/lib/actions/collaborator.ts
+++ b/lib/actions/collaborator.ts
@@ -62,7 +62,7 @@ const handleAddCollaborator = async (prevState: any, formData: FormData) => {
 
 		Promise.resolve().then(async () => {
       const { data, error } = await resend.emails.send({
-				from: "Pages CMS <no-reply@mail.pagescms.org>",
+				from: `Pages CMS <${process.env.RESEND_DOMAIN_EMAIL}>`,
 				to: [email],
 				subject: `Join "${owner}/${repo}" on Pages CMS`,
 				react: InviteEmailTemplate({

From 3d89b66627c8a29dd5fd3cdd787bf286a038a1c1 Mon Sep 17 00:00:00 2001
From: putuwahyu29 <iputuagus.wahyu@gmail.com>
Date: Thu, 30 Jan 2025 14:32:27 +0700
Subject: [PATCH 02/95] Update Readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 948ecf14..db505ab4 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ Variable | Comments
 `GITHUB_APP_WEBHOOK_SECRET` | The secret you picked for your webhook. This is used to ensure the request is coming from GitHub.
 `GITHUB_APP_CLIENT_ID` | GitHub App Client ID from your GitHub App details page.
 `GITHUB_APP_CLIENT_SECRET` | GitHub App Client Secret you generate on theGitHub App details page.
-`RESEND_DOMAIN_EMAIL` | The domain email you use for your Resend account.
+`RESEND_DOMAIN_EMAIL` | The domain email you use for your Resend account (e.g. `no-reply@mail.resend.com` )
 `RESEND_API_KEY` | You'll get that when you create a (free) [Resend](https://resend.com) account to handle emails.
 `SQLITE_URL` | `file:./local.db` for development, `libsql://pages-cms-username.turso.io` for example if you use [Turso](https://turso.tech) (you should, Turso is great).
 `SQLITE_AUTH_TOKEN` | Leave blank for development, otherwise use the token provided by [Turso](https://turso.tech) (if that's what you use).

From 2b019209021bb1a6f8338840c38237b48878420b Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 10 Feb 2025 16:33:11 +0800
Subject: [PATCH 03/95] Dealing with null value in collection views

---
 fields/core/boolean/view-component.tsx   | 2 ++
 fields/core/date/view-component.tsx      | 2 ++
 fields/core/rich-text/view-component.tsx | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/fields/core/boolean/view-component.tsx b/fields/core/boolean/view-component.tsx
index f191513e..c96f0c4d 100644
--- a/fields/core/boolean/view-component.tsx
+++ b/fields/core/boolean/view-component.tsx
@@ -1,6 +1,8 @@
 "use client";
 
 const ViewComponent = ({ value }: { value: boolean}) => {
+  if (value == null) return null;
+  
   const firstValue = Array.isArray(value) ? value[0] : value;
   if (firstValue == null) return null;
   const extraValuesCount = Array.isArray(value) ? value.length - 1 : 0;
diff --git a/fields/core/date/view-component.tsx b/fields/core/date/view-component.tsx
index 01e34ed8..b321c0ea 100644
--- a/fields/core/date/view-component.tsx
+++ b/fields/core/date/view-component.tsx
@@ -12,6 +12,8 @@ const ViewComponent = ({
   value: string | string[],
   field: Field
 }) => {
+  if (!value) return null;
+
   const firstValue = Array.isArray(value) ? value[0] : value;
   if (firstValue == null) return null;
   const extraValuesCount = Array.isArray(value) ? value.length - 1 : 0;
diff --git a/fields/core/rich-text/view-component.tsx b/fields/core/rich-text/view-component.tsx
index a6acfc06..d2306cfb 100644
--- a/fields/core/rich-text/view-component.tsx
+++ b/fields/core/rich-text/view-component.tsx
@@ -9,6 +9,8 @@ const ViewComponent = ({
   value: string,
   field: Field
 }) => {
+  if (!value) return null;
+  
   const sanitizeHtml = (text: string) => {
     return text
       .replace(/<[^>]*>/g, ' ')

From 75a799f43f8bb3f14511c05e87480f84b0fad612 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 10 Feb 2025 20:52:15 +0800
Subject: [PATCH 04/95] Making sure branches are encoded in URLs and API calls
 (#145)

---
 app/(main)/[owner]/[repo]/[branch]/page.tsx |  8 ++++----
 components/collection/collection-view.tsx   | 12 ++++++------
 components/empty-create.tsx                 |  4 ++--
 components/entry/entry-editor.tsx           | 14 +++++++-------
 components/file-options.tsx                 |  6 +++---
 components/folder-create.tsx                |  2 +-
 components/media/media-upload.tsx           |  2 +-
 components/media/media-view.tsx             |  4 ++--
 components/repo/repo-branches.tsx           |  2 +-
 components/repo/repo-nav.tsx                |  8 ++++----
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/(main)/[owner]/[repo]/[branch]/page.tsx b/app/(main)/[owner]/[repo]/[branch]/page.tsx
index 9325ab1e..7b71685b 100644
--- a/app/(main)/[owner]/[repo]/[branch]/page.tsx
+++ b/app/(main)/[owner]/[repo]/[branch]/page.tsx
@@ -12,11 +12,11 @@ export default function Page() {
 
   useEffect(() => {
     if (config?.object.content?.[0]) {
-      router.replace(`/${config.owner}/${config.repo}/${config.branch}/${config.object.content[0].type}/${config.object.content[0].name}`);
+      router.replace(`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/${config.object.content[0].type}/${config.object.content[0].name}`);
     } else if (config?.object.media) {
-      router.replace(`/${config.owner}/${config.repo}/${config.branch}/media`);
-    } else if (config?.object.settings !== false) {
-      router.replace(`/${config?.owner}/${config?.repo}/${config?.branch}/settings`);
+      router.replace(`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media`);
+    } else if (config && config?.object.settings !== false) {
+      router.replace(`/${config?.owner}/${config?.repo}/${encodeURIComponent(config.branch)}/settings`);
     } else {
       setError(true);
     }
diff --git a/components/collection/collection-view.tsx b/components/collection/collection-view.tsx
index 36fadf78..edb9e25f 100644
--- a/components/collection/collection-view.tsx
+++ b/components/collection/collection-view.tsx
@@ -153,7 +153,7 @@ export function CollectionView({
             return (
               <Link
                 className="font-medium truncate"
-                href={`/${config.owner}/${config.repo}/${config.branch}/collection/${encodeURIComponent(name)}/edit/${encodeURIComponent(row.original.path)}`}
+                href={`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collection/${encodeURIComponent(name)}/edit/${encodeURIComponent(row.original.path)}`}
               >
                 {CellView}
               </Link>
@@ -176,7 +176,7 @@ export function CollectionView({
         <div className="flex gap-1">
           <Link
             className={cn(buttonVariants({ variant: "outline", size: "sm" }), "h-8")}
-            href={`/${config.owner}/${config.repo}/${config.branch}/collection/${name}/edit/${encodeURIComponent(row.original.path)}`}
+            href={`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collection/${name}/edit/${encodeURIComponent(row.original.path)}`}
           >
             Edit
           </Link>
@@ -227,7 +227,7 @@ export function CollectionView({
         setIsLoading(true);
         setError(null);
         try {
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${config.branch}/collections/${encodeURIComponent(name)}?path=${encodeURIComponent(path || schema.path)}`);
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collections/${encodeURIComponent(name)}?path=${encodeURIComponent(path || schema.path)}`);
           if (!response.ok) throw new Error(`Failed to fetch collection: ${response.status} ${response.statusText}`);
 
           const data: any = await response.json();
@@ -325,7 +325,7 @@ export function CollectionView({
         description={error}
         className="absolute inset-0"
         cta="Go to settings"
-        href={`/${config.owner}/${config.repo}/${config.branch}/settings`}
+        href={`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/settings`}
       />
     }
   }
@@ -351,13 +351,13 @@ export function CollectionView({
           </FolderCreate>
           <Link
             className={cn(buttonVariants({size: "sm"}), "hidden sm:flex")}
-            href={`/${config.owner}/${config.repo}/${config.branch}/collection/${encodeURIComponent(name)}/new${path && path !== schema.path ? `?parent=${encodeURIComponent(path)}` : ""}`}
+            href={`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collection/${encodeURIComponent(name)}/new${path && path !== schema.path ? `?parent=${encodeURIComponent(path)}` : ""}`}
           >
               Add an entry
           </Link>
           <Link
             className={cn(buttonVariants({size: "icon-sm"}), "sm:hidden shrink-0")}
-            href={`/${config.owner}/${config.repo}/${config.branch}/collection/${encodeURIComponent(name)}/new`}
+            href={`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collection/${encodeURIComponent(name)}/new`}
           >
               <Plus className="h-4 w-4"/>
           </Link>
diff --git a/components/empty-create.tsx b/components/empty-create.tsx
index 3e9b5c0d..24c190a1 100644
--- a/components/empty-create.tsx
+++ b/components/empty-create.tsx
@@ -26,7 +26,7 @@ const EmptyCreate = ({
   let path = "";
   let content: string | Record<string, any> = "";
   let toCreate = "";
-  let redirectTo = `/${config.owner}/${config.repo}/${config.branch}`;
+  let redirectTo = `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}`;
 
   if (type === "settings") {
     path = ".pages.yml";
@@ -65,7 +65,7 @@ const EmptyCreate = ({
     try {
       const createPromise = new Promise(async (resolve, reject) => {
         try {
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${config.branch}/files/${encodeURIComponent(normalizePath(path))}`, {
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/files/${encodeURIComponent(normalizePath(path))}`, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
             body: JSON.stringify({
diff --git a/components/entry/entry-editor.tsx b/components/entry/entry-editor.tsx
index a34cd7a6..c44de120 100644
--- a/components/entry/entry-editor.tsx
+++ b/components/entry/entry-editor.tsx
@@ -107,7 +107,7 @@ export function EntryEditor({
         setError(null);
 
         try {
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${config.branch}/entries/${encodeURIComponent(path)}?name=${encodeURIComponent(name)}`);
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/entries/${encodeURIComponent(path)}?name=${encodeURIComponent(name)}`);
           if (!response.ok) throw new Error(`Failed to fetch entry: ${response.status} ${response.statusText}`);
 
           const data: any = await response.json();
@@ -137,7 +137,7 @@ export function EntryEditor({
     const fetchHistory = async () => {
       if (path) {
         try {
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${config.branch}/entries/${encodeURIComponent(path)}/history?name=${encodeURIComponent(name)}`);
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/entries/${encodeURIComponent(path)}/history?name=${encodeURIComponent(name)}`);
           if (!response.ok) throw new Error(`Failed to fetch entry's history: ${response.status} ${response.statusText}`);
           
           const data: any = await response.json();
@@ -159,7 +159,7 @@ export function EntryEditor({
       try {
         const savePath = path ?? `${parent ?? schema.path}/${generateFilename(schema.filename, schema, contentObject)}`;
 
-        const response = await fetch(`/api/${config.owner}/${config.repo}/${config.branch}/files/${encodeURIComponent(savePath)}`, {
+        const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/files/${encodeURIComponent(savePath)}`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify({
@@ -178,7 +178,7 @@ export function EntryEditor({
         
         if (data.data.sha !== sha) setSha(data.data.sha);
 
-        if (!path && schema.type === "collection") router.push(`/${config.owner}/${config.repo}/${config.branch}/collection/${encodeURIComponent(name)}/edit/${encodeURIComponent(data.data.path)}`);
+        if (!path && schema.type === "collection") router.push(`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collection/${encodeURIComponent(name)}/edit/${encodeURIComponent(data.data.path)}`);
 
         resolve(data);
       } catch (error) {
@@ -205,7 +205,7 @@ export function EntryEditor({
   const handleDelete = (path: string) => {
     // TODO: disable save button or freeze form while deleting?
     if (schema.type === "collection") {
-      router.push(`/${config.owner}/${config.repo}/${config.branch}/collection/${encodeURIComponent(name)}`);
+      router.push(`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collection/${encodeURIComponent(name)}`);
     } else {
       setRefetchTrigger(refetchTrigger + 1);
     }
@@ -213,7 +213,7 @@ export function EntryEditor({
 
   const handleRename = (oldPath: string, newPath: string) => {
     setPath(newPath);
-    router.replace(`/${config.owner}/${config.repo}/${config.branch}/collection/${encodeURIComponent(name)}/edit/${encodeURIComponent(newPath)}`);
+    router.replace(`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collection/${encodeURIComponent(name)}/edit/${encodeURIComponent(newPath)}`);
   };
 
   const loadingSkeleton = useMemo(() => (
@@ -337,7 +337,7 @@ export function EntryEditor({
           description={error}
           className="absolute inset-0"
           cta="Go to settings"
-          href={`/${config.owner}/${config.repo}/${config.branch}/settings`}
+          href={`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/settings`}
         />
       );
     }
diff --git a/components/file-options.tsx b/components/file-options.tsx
index c175b563..67961ddd 100644
--- a/components/file-options.tsx
+++ b/components/file-options.tsx
@@ -76,7 +76,7 @@ export function FileOptions({
           });
           if (name) params.set("name", name);
 
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${config.branch}/files/${encodeURIComponent(normalizedPath)}?${params.toString()}`, {
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/files/${encodeURIComponent(normalizedPath)}?${params.toString()}`, {
             method: "DELETE",
           });
 
@@ -112,7 +112,7 @@ export function FileOptions({
       
       const renamePromise = new Promise(async (resolve, reject) => {
         try {
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${config.branch}/files/${encodeURIComponent(normalizedPath)}/rename`, {
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/files/${encodeURIComponent(normalizedPath)}/rename`, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
             body: JSON.stringify({
@@ -155,7 +155,7 @@ export function FileOptions({
           </DropdownMenuTrigger>
           <DropdownMenuContent align="end" portalProps={portalProps}>
             <DropdownMenuItem asChild>
-              <a href={`https://github.com/${config.owner}/${config.repo}/blob/${config.branch}/${path}`} target="_blank">
+              <a href={`https://github.com/${config.owner}/${config.repo}/blob/${encodeURIComponent(config.branch)}/${path}`} target="_blank">
                 <span className="mr-4">See on GitHub</span>
                 <ArrowUpRight className="h-3 w-3 ml-auto min-ml-4 opacity-50" />
               </a>
diff --git a/components/folder-create.tsx b/components/folder-create.tsx
index 09aaf10d..47e658ca 100644
--- a/components/folder-create.tsx
+++ b/components/folder-create.tsx
@@ -44,7 +44,7 @@ const FolderCreate = ({
 
       const createPromise = new Promise(async (resolve, reject) => {
         try {
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${config.branch}/files/${encodeURIComponent(fullNewPath + "/.gitkeep")}`, {
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/files/${encodeURIComponent(fullNewPath + "/.gitkeep")}`, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
             body: JSON.stringify({
diff --git a/components/media/media-upload.tsx b/components/media/media-upload.tsx
index 1461bf9a..d2829d88 100644
--- a/components/media/media-upload.tsx
+++ b/components/media/media-upload.tsx
@@ -48,7 +48,7 @@ const MediaUpload = ({
 
             const uploadPromise = new Promise(async (resolve, reject) => {
               try {
-                const response = await fetch(`/api/${config.owner}/${config.repo}/${config.branch}/files/${encodeURIComponent(fullPath)}`, {
+                const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/files/${encodeURIComponent(fullPath)}`, {
                   method: "POST",
                   headers: { "Content-Type": "application/json" },
                   body: JSON.stringify({
diff --git a/components/media/media-view.tsx b/components/media/media-view.tsx
index c5b030da..a72f05f2 100644
--- a/components/media/media-view.tsx
+++ b/components/media/media-view.tsx
@@ -71,7 +71,7 @@ const MediaView = ({
         setError(null);
 
         try {
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${config.branch}/media/${encodeURIComponent(path)}`);
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media/${encodeURIComponent(path)}`);
           if (!response.ok) throw new Error(`Failed to fetch media: ${response.status} ${response.statusText}`);
 
           const data: any = await response.json();
@@ -201,7 +201,7 @@ const MediaView = ({
         description="You have no media defined in your settings."
         className="absolute inset-0"
         cta="Go to settings"
-        href={`/${config.owner}/${config.repo}/${config.branch}/settings`}
+        href={`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/settings`}
       />
     );
   }
diff --git a/components/repo/repo-branches.tsx b/components/repo/repo-branches.tsx
index 6358c56e..584922d6 100644
--- a/components/repo/repo-branches.tsx
+++ b/components/repo/repo-branches.tsx
@@ -39,7 +39,7 @@ export function RepoBranches() {
         try {
           const newBranch = search;
 
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${config.branch}/branches`, {
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/branches`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({
diff --git a/components/repo/repo-nav.tsx b/components/repo/repo-nav.tsx
index 14d0f89c..6486ed84 100644
--- a/components/repo/repo-nav.tsx
+++ b/components/repo/repo-nav.tsx
@@ -52,7 +52,7 @@ const RepoNav = ({
         ? <FileStack className="h-5 w-5 mr-2" />
         : <FileText className="h-5 w-5 mr-2" />
       ,
-      href: `/${config.owner}/${config.repo}/${config.branch}/${item.type}/${encodeURIComponent(item.name)}`,
+      href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/${item.type}/${encodeURIComponent(item.name)}`,
       label: item.label || item.name,
     })) || [];
 
@@ -60,7 +60,7 @@ const RepoNav = ({
       ? {
           key: "media",
           icon: <ImageIcon className="h-5 w-5 mr-2" />,
-          href: `/${config.owner}/${config.repo}/${config.branch}/media`,
+          href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media`,
           label: "Media"
         }
       : null;
@@ -69,7 +69,7 @@ const RepoNav = ({
       ? {
           key: "settings",
           icon: <Settings className="h-5 w-5 mr-2" />,
-          href: `/${config.owner}/${config.repo}/${config.branch}/settings`,
+          href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/settings`,
           label: "Settings"
         }
       : null;
@@ -78,7 +78,7 @@ const RepoNav = ({
       ? {
           key: "collaborators",
           icon: <Users className="h-5 w-5 mr-2" />,
-          href: `/${config.owner}/${config.repo}/${config.branch}/collaborators`,
+          href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collaborators`,
           label: "Collaborators"
         }
       : null;

From 3b735b020190aa7b7e665c9fff4887b7b68d3132 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 10 Feb 2025 21:08:37 +0800
Subject: [PATCH 05/95] Fixing bug with githubImage service

---
 lib/githubImage.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/githubImage.ts b/lib/githubImage.ts
index 03b1e9e5..e7d8c578 100644
--- a/lib/githubImage.ts
+++ b/lib/githubImage.ts
@@ -18,7 +18,7 @@ const getRelativeUrl = (
   let relativePath = path;
 
   if (path.startsWith("https://raw.githubusercontent.com/")) {
-    const pattern = new RegExp(`^https://raw\\.githubusercontent\\.com/${owner}/${repo}/${branch}/`, "i");
+    const pattern = new RegExp(`^https://raw\\.githubusercontent\\.com/${owner}/${repo}/${encodeURIComponent(branch)}/`, "i");
     relativePath = path.replace(pattern, "");
     relativePath = relativePath.split("?")[0];
   }
@@ -41,13 +41,13 @@ const getRawUrl = async (
     if (!filename) return null;
     const parentPath = getParentPath(decodedPath);
     
-    const parentFullPath = `${owner}/${repo}/${branch}/${parentPath}`;
+    const parentFullPath = `${owner}/${repo}/${encodeURIComponent(branch)}/${parentPath}`;
     
     if (!cache[parentFullPath]?.files?.[filename] || (Date.now() - (cache[parentFullPath]?.time || 0) > ttl)) {
       delete cache[parentFullPath];
       
       if (!requests[parentFullPath]) {
-        requests[parentFullPath] = fetch(`/api/${owner}/${repo}/${branch}/media/${encodeURIComponent(parentPath)}`)
+        requests[parentFullPath] = fetch(`/api/${owner}/${repo}/${encodeURIComponent(branch)}/media/${encodeURIComponent(parentPath)}`)
           .then(response => {
             if (!response.ok) throw new Error(`Failed to fetch media: ${response.status} ${response.statusText}`);
             
@@ -74,7 +74,7 @@ const getRawUrl = async (
 
     return cache[parentFullPath]?.files?.[filename];
   } else {
-    return `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${encodeURI(decodedPath)}`;
+    return `https://raw.githubusercontent.com/${owner}/${repo}/${encodeURIComponent(branch)}/${encodeURI(decodedPath)}`;
   }
 };
 
@@ -91,7 +91,7 @@ const rawToRelativeUrls = (
     const quote = match[1] ? "\"" : "'";
 
     if (src.startsWith("https://raw.githubusercontent.com/")) {
-      let relativePath = src.replace(new RegExp(`https://raw\\.githubusercontent\\.com/${owner}/${repo}/${branch}/`, "gi"), "");
+      let relativePath = src.replace(new RegExp(`https://raw\\.githubusercontent\\.com/${owner}/${repo}/${encodeURIComponent(branch)}/`, "gi"), "");
       relativePath = relativePath.split("?")[0];
 
       if (!encode) relativePath = decodeURIComponent(relativePath);

From 814e7603f97bd240d287ec3101b8c50dc34b284c Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 10 Feb 2025 21:45:04 +0800
Subject: [PATCH 06/95] Fixing more branch URLs

---
 app/(main)/[owner]/[repo]/[branch]/page.tsx | 2 +-
 components/entry/entry-editor.tsx           | 2 +-
 components/entry/entry-history.tsx          | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/(main)/[owner]/[repo]/[branch]/page.tsx b/app/(main)/[owner]/[repo]/[branch]/page.tsx
index 7b71685b..0a531668 100644
--- a/app/(main)/[owner]/[repo]/[branch]/page.tsx
+++ b/app/(main)/[owner]/[repo]/[branch]/page.tsx
@@ -28,7 +28,7 @@ export default function Page() {
         description={<>This branch and/or repository has no configuration and settings are disabled. Edit on GitHub if you think this is a mistake.</>}
         className="absolute inset-0"
         cta="Edit configuration on GitHub"
-        href={`https://github.com/${config?.owner}/${config?.repo}/edit/${config?.branch}/.pages.yml`}
+        href={`https://github.com/${config?.owner}/${config?.repo}/edit/${encodeURIComponent(config?.branch)}/.pages.yml`}
       />
     : null;
 }
\ No newline at end of file
diff --git a/components/entry/entry-editor.tsx b/components/entry/entry-editor.tsx
index c44de120..a4a1132d 100644
--- a/components/entry/entry-editor.tsx
+++ b/components/entry/entry-editor.tsx
@@ -95,7 +95,7 @@ export function EntryEditor({
   const navigateBack = useMemo(() => {
     const parentPath = path ? getParentPath(path) : undefined;
     return schema && schema.type === "collection"
-      ? `/${config?.owner}/${config?.repo}/${config?.branch}/collection/${schema.name}${parentPath && parentPath !== schema.path ? `?path=${encodeURIComponent(parentPath)}` : ""}`
+      ? `/${config?.owner}/${config?.repo}/${encodeURIComponent(config?.branch)}/collection/${schema.name}${parentPath && parentPath !== schema.path ? `?path=${encodeURIComponent(parentPath)}` : ""}`
       : ""},
     [schema, config?.owner, config?.repo, config?.branch, path]
   );
diff --git a/components/entry/entry-history.tsx b/components/entry/entry-history.tsx
index 88860140..0f76cfc3 100644
--- a/components/entry/entry-history.tsx
+++ b/components/entry/entry-history.tsx
@@ -50,9 +50,9 @@ export function EntryHistoryBlock({
             </div>
           </a>
         ))}
-        {history.length > 3 && (
+        {config && history.length > 3 && (
           <a
-            href={`https://github.com/${config?.owner}/${config?.repo}/commits/${config?.branch}/${path}`}
+            href={`https://github.com/${config?.owner}/${config?.repo}/commits/${encodeURIComponent(config.branch)}/${path}`}
             target="_blank"
             className="flex items-center rounded-lg px-3 py-2 transition-all hover:bg-accent ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
           >
@@ -99,12 +99,12 @@ export function EntryHistoryDropdown({
               </a>
             </DropdownMenuItem>
           ))}
-          {history.length > 3 && (
+          {config && history.length > 3 && (
             <>
               <DropdownMenuSeparator/>
               <DropdownMenuItem>
                 <a
-                  href={`https://github.com/${config?.owner}/${config?.repo}/commits/${config?.branch}/${path}`}
+                  href={`https://github.com/${config?.owner}/${config?.repo}/commits/${encodeURIComponent(config.branch)}/${path}`}
                   target="_blank"
                   className="flex items-center w-full"
                 >

From 56c5a83fdd281d481d33498d2b94455742178985 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 10 Feb 2025 21:51:29 +0800
Subject: [PATCH 07/95] Fixing more branch URLs

---
 app/(main)/[owner]/[repo]/[branch]/page.tsx | 6 +++---
 components/entry/entry-editor.tsx           | 4 ++--
 components/entry/entry-history.tsx          | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/(main)/[owner]/[repo]/[branch]/page.tsx b/app/(main)/[owner]/[repo]/[branch]/page.tsx
index 0a531668..7f8bc3ec 100644
--- a/app/(main)/[owner]/[repo]/[branch]/page.tsx
+++ b/app/(main)/[owner]/[repo]/[branch]/page.tsx
@@ -15,8 +15,8 @@ export default function Page() {
       router.replace(`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/${config.object.content[0].type}/${config.object.content[0].name}`);
     } else if (config?.object.media) {
       router.replace(`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media`);
-    } else if (config && config?.object.settings !== false) {
-      router.replace(`/${config?.owner}/${config?.repo}/${encodeURIComponent(config.branch)}/settings`);
+    } else if (config?.object.settings !== false) {
+      router.replace(`/${config?.owner}/${config?.repo}/${encodeURIComponent(config!.branch)}/settings`);
     } else {
       setError(true);
     }
@@ -28,7 +28,7 @@ export default function Page() {
         description={<>This branch and/or repository has no configuration and settings are disabled. Edit on GitHub if you think this is a mistake.</>}
         className="absolute inset-0"
         cta="Edit configuration on GitHub"
-        href={`https://github.com/${config?.owner}/${config?.repo}/edit/${encodeURIComponent(config?.branch)}/.pages.yml`}
+        href={`https://github.com/${config?.owner}/${config?.repo}/edit/${encodeURIComponent(config!.branch)}/.pages.yml`}
       />
     : null;
 }
\ No newline at end of file
diff --git a/components/entry/entry-editor.tsx b/components/entry/entry-editor.tsx
index a4a1132d..c9016700 100644
--- a/components/entry/entry-editor.tsx
+++ b/components/entry/entry-editor.tsx
@@ -95,9 +95,9 @@ export function EntryEditor({
   const navigateBack = useMemo(() => {
     const parentPath = path ? getParentPath(path) : undefined;
     return schema && schema.type === "collection"
-      ? `/${config?.owner}/${config?.repo}/${encodeURIComponent(config?.branch)}/collection/${schema.name}${parentPath && parentPath !== schema.path ? `?path=${encodeURIComponent(parentPath)}` : ""}`
+      ? `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collection/${schema.name}${parentPath && parentPath !== schema.path ? `?path=${encodeURIComponent(parentPath)}` : ""}`
       : ""},
-    [schema, config?.owner, config?.repo, config?.branch, path]
+    [schema, config.owner, config.repo, config.branch, path]
   );
 
   useEffect(() => {
diff --git a/components/entry/entry-history.tsx b/components/entry/entry-history.tsx
index 0f76cfc3..041cc24c 100644
--- a/components/entry/entry-history.tsx
+++ b/components/entry/entry-history.tsx
@@ -50,9 +50,9 @@ export function EntryHistoryBlock({
             </div>
           </a>
         ))}
-        {config && history.length > 3 && (
+        {history.length > 3 && (
           <a
-            href={`https://github.com/${config?.owner}/${config?.repo}/commits/${encodeURIComponent(config.branch)}/${path}`}
+            href={`https://github.com/${config?.owner}/${config?.repo}/commits/${encodeURIComponent(config!.branch)}/${path}`}
             target="_blank"
             className="flex items-center rounded-lg px-3 py-2 transition-all hover:bg-accent ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
           >
@@ -99,12 +99,12 @@ export function EntryHistoryDropdown({
               </a>
             </DropdownMenuItem>
           ))}
-          {config && history.length > 3 && (
+          {history.length > 3 && (
             <>
               <DropdownMenuSeparator/>
               <DropdownMenuItem>
                 <a
-                  href={`https://github.com/${config?.owner}/${config?.repo}/commits/${encodeURIComponent(config.branch)}/${path}`}
+                  href={`https://github.com/${config?.owner}/${config?.repo}/commits/${encodeURIComponent(config!.branch)}/${path}`}
                   target="_blank"
                   className="flex items-center w-full"
                 >

From ee4e3242e9b4afa9d961ef227957d4308336ab0c Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 12 Feb 2025 09:35:43 +0800
Subject: [PATCH 08/95] Staring work on reference and autocomplete

---
 fields/core/image/edit-component.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fields/core/image/edit-component.tsx b/fields/core/image/edit-component.tsx
index 5573bfbd..4da17d2f 100644
--- a/fields/core/image/edit-component.tsx
+++ b/fields/core/image/edit-component.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { forwardRef, useCallback, useMemo, useRef, useState } from "react";
+import { forwardRef, useCallback, useMemo, useState } from "react";
 import { getParentPath } from "@/lib/utils/file";
 import { MediaDialog } from "@/components/media/media-dialog";
 import { Thumbnail } from "@/components/thumbnail";

From ab6646a503c3630ade44e1fdcaed82bbdb06f233 Mon Sep 17 00:00:00 2001
From: Ryan Gittings <ryan@gittings.studio>
Date: Fri, 21 Feb 2025 16:18:58 +0000
Subject: [PATCH 09/95] Fix collection view

---
 components/collection/collection-view.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/collection/collection-view.tsx b/components/collection/collection-view.tsx
index edb9e25f..0e9b73a4 100644
--- a/components/collection/collection-view.tsx
+++ b/components/collection/collection-view.tsx
@@ -66,7 +66,7 @@ export function CollectionView({
         });
       } else {
         pathAndFieldArray = schema.fields
-          .filter((field: any) => field?.type !== 'object')
+          .filter((field: any) => field?.type !== 'object' && !field.hidden)
           .map((field: any) => ({ path: field.name, field: field }));
       }
     } else {

From accc740285f3b426b3536b883076f41a3f783edf Mon Sep 17 00:00:00 2001
From: Ryan Gittings <ryan@gittings.studio>
Date: Fri, 21 Feb 2025 16:49:51 +0000
Subject: [PATCH 10/95] Improve repo permissions

---
 app/api/repos/[owner]/route.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/repos/[owner]/route.ts b/app/api/repos/[owner]/route.ts
index e546af3a..34317c36 100644
--- a/app/api/repos/[owner]/route.ts
+++ b/app/api/repos/[owner]/route.ts
@@ -49,8 +49,8 @@ export async function GET(
         });
         repos = response.data.items;
       }
-      
-      repos = repos.map(repo => ({
+
+      repos = repos.filter(repo => repo.permissions.push).map(repo => ({
         owner: repo.owner.login,
         repo: repo.name,
         private: repo.private,

From 77a607fdc8eb508aa5b500f06d139b75e321ec6d Mon Sep 17 00:00:00 2001
From: Andrew Monty <andrew1503@gmail.com>
Date: Sat, 22 Feb 2025 12:14:00 -0500
Subject: [PATCH 11/95] added custom field to auto-generate a uuid

---
 fields/custom/uuid/edit-component.tsx | 10 ++++++++++
 fields/custom/uuid/index.tsx          | 15 +++++++++++++++
 lib/configSchema.ts                   |  2 +-
 lib/schema.ts                         |  5 ++++-
 types/field.ts                        |  2 +-
 5 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 fields/custom/uuid/edit-component.tsx
 create mode 100644 fields/custom/uuid/index.tsx

diff --git a/fields/custom/uuid/edit-component.tsx b/fields/custom/uuid/edit-component.tsx
new file mode 100644
index 00000000..61c22053
--- /dev/null
+++ b/fields/custom/uuid/edit-component.tsx
@@ -0,0 +1,10 @@
+"use client";
+
+import { forwardRef } from "react";
+import { Input } from "@/components/ui/input";
+
+const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>) => {
+  return <Input {...props} ref={ref} className="text-base" />;
+});
+
+export { EditComponent };
diff --git a/fields/custom/uuid/index.tsx b/fields/custom/uuid/index.tsx
new file mode 100644
index 00000000..4f8e6e29
--- /dev/null
+++ b/fields/custom/uuid/index.tsx
@@ -0,0 +1,15 @@
+import { z } from "zod";
+import { Field } from "@/types/field";
+import { EditComponent } from "./edit-component";
+
+const defaultValue = (): string => {
+  return crypto.randomUUID();
+};
+
+const schema = (_: Field) => {
+  let zodSchema = z.coerce.string();
+
+  return zodSchema;
+};
+
+export { EditComponent, defaultValue, schema };
diff --git a/lib/configSchema.ts b/lib/configSchema.ts
index 9b30c3da..88973ebf 100644
--- a/lib/configSchema.ts
+++ b/lib/configSchema.ts
@@ -49,7 +49,7 @@ const FieldObjectSchema: z.ZodType<any> = z.lazy(() => z.object({
   description: z.string().optional().nullable(),
   type: z.enum([
     "boolean", "code", "date", "image", "number", "object", "rich-text",
-    "select", "string", "text"
+    "select", "string", "text", "uuid"
   ], {
     message: "'type' is required and must be set to a valid field type (see documentation)."
   }),
diff --git a/lib/schema.ts b/lib/schema.ts
index 45ad7284..34a168ad 100644
--- a/lib/schema.ts
+++ b/lib/schema.ts
@@ -69,7 +69,10 @@ const getDefaultValue = (field: Record<string, any>) => {
   } else if (field.type === "object") {
     return initializeState(field.fields, {});
   } else {
-    return defaultValues?.[field.type] || "";
+    const defaultValue = defaultValues?.[field.type];
+    return defaultValue instanceof Function
+      ? defaultValue()
+      : defaultValue || "";
   }
 };
 
diff --git a/types/field.ts b/types/field.ts
index c7f4ba7d..b5736685 100644
--- a/types/field.ts
+++ b/types/field.ts
@@ -2,7 +2,7 @@ export type Field = {
   name: string;
   label?: string | false;
   description?: string | null;
-  type: "boolean" | "code" | "date" | "image" | "number" | "object" | "rich-text" | "select" | "string" | "text" | string;
+  type: "boolean" | "code" | "date" | "image" | "number" | "object" | "rich-text" | "select" | "string" | "text" | "uuid" | string;
   default?: any;
   list?: boolean | { min?: number; max?: number };
   hidden?: boolean | null;

From fe53b24b40687b94632f11a8c7f90700f9317bd5 Mon Sep 17 00:00:00 2001
From: Andrew Monty <andrew1503@gmail.com>
Date: Sat, 22 Feb 2025 12:42:49 -0500
Subject: [PATCH 12/95] move field to core

---
 fields/{custom => core}/uuid/edit-component.tsx | 0
 fields/{custom => core}/uuid/index.tsx          | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename fields/{custom => core}/uuid/edit-component.tsx (100%)
 rename fields/{custom => core}/uuid/index.tsx (100%)

diff --git a/fields/custom/uuid/edit-component.tsx b/fields/core/uuid/edit-component.tsx
similarity index 100%
rename from fields/custom/uuid/edit-component.tsx
rename to fields/core/uuid/edit-component.tsx
diff --git a/fields/custom/uuid/index.tsx b/fields/core/uuid/index.tsx
similarity index 100%
rename from fields/custom/uuid/index.tsx
rename to fields/core/uuid/index.tsx

From b0d5a02e1d17c9282f9b09246b64e3d330e121a5 Mon Sep 17 00:00:00 2001
From: Ryan Gittings <ryan@gittings.studio>
Date: Tue, 4 Mar 2025 10:56:47 +0000
Subject: [PATCH 13/95] Fixes

---
 app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
index 8985b28b..2b8abfe0 100644
--- a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
@@ -139,7 +139,7 @@ const parseContents = (
         object: contentObject,
         type: "file",
       };
-    } else if (item.type === "tree") {
+    } else if (item.type === "tree" && !excludedFiles.includes(item.name)) {
       return {
         name: item.name,
         path: item.path,

From 45996efb7172ec9d547fbe57af35601ff17954b6 Mon Sep 17 00:00:00 2001
From: Ryan Gittings <ryan@gittings.studio>
Date: Tue, 4 Mar 2025 11:53:07 +0000
Subject: [PATCH 14/95] Fix list defaults

---
 components/entry/entry-form.tsx          | 61 +++++++++++++-----------
 fields/core/rich-text/edit-component.tsx | 34 ++++++-------
 2 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/components/entry/entry-form.tsx b/components/entry/entry-form.tsx
index 38c8dc00..0ded3e2d 100644
--- a/components/entry/entry-form.tsx
+++ b/components/entry/entry-form.tsx
@@ -36,7 +36,7 @@ import {
   TooltipTrigger,
 } from "@/components/ui/tooltip";
 import {
-  DndContext, 
+  DndContext,
   closestCenter,
   KeyboardSensor,
   PointerSensor,
@@ -81,9 +81,9 @@ const SortableItem = ({
   };
 
   return (
-    <div ref={setNodeRef} className={cn("bg-background flex gap-x-1 rounded-lg border items-center", type === "object" ? "px-2 py-4" : "px-1 py-2", isDragging ? "z-50" : "z-10" )} style={style}>
+    <div ref={setNodeRef} className={cn("bg-background flex gap-x-1 rounded-lg border items-center", type === "object" ? "px-2 py-4" : "px-1 py-2", isDragging ? "z-50" : "z-10")} style={style}>
       <Button type="button" variant="ghost" size="icon-sm" className="h-8 cursor-move" {...attributes} {...listeners}>
-        <GripVertical className="h-4 w-4"/>
+        <GripVertical className="h-4 w-4" />
       </Button>
       {children}
     </div>
@@ -114,8 +114,13 @@ const ListField = ({
   const hasAppended = useRef(false);
 
   useEffect(() => {
-    if (arrayFields.length === 0 && !hasAppended.current) {
-      append(getDefaultValue(field));
+    const defaultValue = getDefaultValue(field);
+    if (typeof defaultValue === "object" && Object.values(defaultValue).filter(n => n).length === 0) {
+      return;
+    }
+
+    if (arrayFields.length === 0 && !hasAppended.current && defaultValue) {
+      append(defaultValue);
       hasAppended.current = true;
     }
   }, [arrayFields, append, field]);
@@ -140,7 +145,7 @@ const ListField = ({
       setValue(fieldName, updatedValues);
     }
   };
-  
+
   return (
     <FormField
       name={fieldName}
@@ -182,23 +187,23 @@ const ListField = ({
             {typeof field.list === "object" && field.list?.max && arrayFields.length >= field.list.max
               ? null
               : <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  onClick={() => {
-                    append(field.type === "object"
-                      ? initializeState(field.fields, {}, true)
-                      : getDefaultValue(field)
-                    );
-                  }}
-                  className="gap-x-2"
-                >
-                  <Plus className="h-4 w-4" />
-                  Add an entry
-                </Button>
+                type="button"
+                variant="outline"
+                size="sm"
+                onClick={() => {
+                  append(field.type === "object"
+                    ? initializeState(field.fields, {}, true)
+                    : getDefaultValue(field)
+                  );
+                }}
+                className="gap-x-2"
+              >
+                <Plus className="h-4 w-4" />
+                Add an entry
+              </Button>
             }
           </div>
-          <FormMessage/>
+          <FormMessage />
         </FormItem>
       )}
     />
@@ -230,7 +235,7 @@ const renderSingleField = (
             <FieldComponent {...fieldProps} field={field} />
           </FormControl>
           {field.description && <FormDescription>{field.description}</FormDescription>}
-          <FormMessage/>
+          <FormMessage />
         </FormItem>
       )}
     />
@@ -279,7 +284,7 @@ const EntryForm = ({
   const renderFields = (fields: Field[], parentName?: string) => {
     return fields.map((field) => {
       if (field.hidden) return null;
-      
+
       const fieldName = parentName ? `${parentName}.${field.name}` : field.name;
 
       if (field.type === "object" && field.list && !supportsList[field.type]) {
@@ -324,17 +329,17 @@ const EntryForm = ({
                   className={cn(buttonVariants({ variant: "outline", size: "icon-xs" }), "mr-4 shrink-0")}
                   href={navigateBack}
                 >
-                  <ChevronLeft className="h-4 w-4"/>
+                  <ChevronLeft className="h-4 w-4" />
                 </Link>
               }
-              
+
               <h1 className="font-semibold text-lg md:text-2xl truncate">{title}</h1>
             </header>
             <div onSubmit={form.handleSubmit(handleSubmit)} className="grid items-start gap-6">
               {renderFields(fields)}
             </div>
           </div>
-          
+
           <div className="hidden lg:block w-64">
             <div className="flex flex-col gap-y-4 sticky top-0">
               <div className="flex gap-x-2">
@@ -344,11 +349,11 @@ const EntryForm = ({
                 </Button>
                 {options ? options : null}
               </div>
-              {path && history && <EntryHistoryBlock history={history} path={path}/>}
+              {path && history && <EntryHistoryBlock history={history} path={path} />}
             </div>
           </div>
           <div className="lg:hidden fixed top-0 right-0 h-14 flex items-center gap-x-2 z-10 pr-4 md:pr-6">
-            {path && history && <EntryHistoryDropdown history={history} path={path}/>}
+            {path && history && <EntryHistoryDropdown history={history} path={path} />}
             <Button type="submit" disabled={isSubmitting}>
               Save
               {isSubmitting && (<Loader className="ml-2 h-4 w-4 animate-spin" />)}
diff --git a/fields/core/rich-text/edit-component.tsx b/fields/core/rich-text/edit-component.tsx
index 968cabe3..1d6a27d1 100644
--- a/fields/core/rich-text/edit-component.tsx
+++ b/fields/core/rich-text/edit-component.tsx
@@ -62,13 +62,13 @@ import {
 const EditComponent = forwardRef((props: any, ref) => {
   const { config } = useConfig();
   const { isPrivate } = useRepo();
-  
+
   const { value, onChange } = props;
-  const mediaDialogRef = useRef<MediaDialogHandle>(null); 
+  const mediaDialogRef = useRef<MediaDialogHandle>(null);
   const bubbleMenuRef = useRef<HTMLDivElement | null>(null);
 
   const [isContentReady, setContentReady] = useState(false);
-  
+
   const [linkUrl, setLinkUrl] = useState("");
 
   const openMediaDialog = config?.object.media?.input
@@ -76,10 +76,10 @@ const EditComponent = forwardRef((props: any, ref) => {
     : undefined;
 
   const editor = useEditor({
-    immediatelyRender: true,
+    immediatelyRender: false,
     extensions: [
       StarterKit.configure({
-        dropcursor: { width: 2}
+        dropcursor: { width: 2 }
       }),
       Image.extend({
         addAttributes() {
@@ -116,7 +116,7 @@ const EditComponent = forwardRef((props: any, ref) => {
     onUpdate: ({ editor }) => onChange(editor.getHTML()),
     onCreate: async ({ editor }) => {
       if (config && value) {
-        const initialContent = await relativeToRawUrls(config.owner, config.repo, config.branch, value, isPrivate); 
+        const initialContent = await relativeToRawUrls(config.owner, config.repo, config.branch, value, isPrivate);
         editor.commands.setContent(initialContent || "<p></p>");
       }
       setContentReady(true);
@@ -150,7 +150,7 @@ const EditComponent = forwardRef((props: any, ref) => {
     if (editor.isActive({ textAlign: "justify" })) return <AlignJustify className="h-4 w-4" />;
     return <AlignLeft className="h-4 w-4" />;
   };
-  
+
   return (
     <>
       <Skeleton className={cn("rounded-md h-[8.5rem]", isContentReady ? "hidden" : "")} />
@@ -166,10 +166,10 @@ const EditComponent = forwardRef((props: any, ref) => {
                   className="gap-x-1"
                 >
                   {getBlockIcon(editor)}
-                  <ChevronsUpDown className="w-3 h-3"/>
+                  <ChevronsUpDown className="w-3 h-3" />
                 </Button>
               </DropdownMenuTrigger>
-              <DropdownMenuContent align="start" portalProps={{container: bubbleMenuRef.current}}>
+              <DropdownMenuContent align="start" portalProps={{ container: bubbleMenuRef.current }}>
                 <DropdownMenuItem onClick={() => editor.chain().focus().setParagraph().run()} className="gap-x-1.5">
                   <Pilcrow className="h-4 w-4" />
                   Text
@@ -232,7 +232,7 @@ const EditComponent = forwardRef((props: any, ref) => {
                     onClick={() => linkUrl
                       ? editor.chain().focus().extendMarkRange('link').setLink({ href: linkUrl }).run()
                       : editor.chain().focus().extendMarkRange('link').unsetLink()
-                      .run()
+                        .run()
                     }
                   >Link</Button>
                   <Button
@@ -248,7 +248,7 @@ const EditComponent = forwardRef((props: any, ref) => {
                 </div>
               </PopoverContent>
             </Popover>
-            {(editor.isActive("paragraph") || editor.isActive("heading")) && 
+            {(editor.isActive("paragraph") || editor.isActive("heading")) &&
               <DropdownMenu>
                 <DropdownMenuTrigger asChild>
                   <Button
@@ -258,10 +258,10 @@ const EditComponent = forwardRef((props: any, ref) => {
                     className="gap-x-1"
                   >
                     {getAlignIcon(editor)}
-                    <ChevronsUpDown className="w-3 h-3"/>
+                    <ChevronsUpDown className="w-3 h-3" />
                   </Button>
                 </DropdownMenuTrigger>
-                <DropdownMenuContent portalProps={{container: bubbleMenuRef.current}}>
+                <DropdownMenuContent portalProps={{ container: bubbleMenuRef.current }}>
                   <DropdownMenuItem onClick={() => editor.chain().focus().setTextAlign("left").run()} className="gap-x-1.5">
                     <AlignLeft className="h-4 w-4" />
                     Align left
@@ -335,7 +335,7 @@ const EditComponent = forwardRef((props: any, ref) => {
             >
               <RemoveFormatting className="h-4 w-4" />
             </Button>
-            {editor.isActive("table") && 
+            {editor.isActive("table") &&
               <DropdownMenu>
                 <DropdownMenuTrigger asChild>
                   <Button
@@ -345,10 +345,10 @@ const EditComponent = forwardRef((props: any, ref) => {
                     className="gap-x-1"
                   >
                     <TableIcon className="h-4 w-4" />
-                    <ChevronsUpDown className="w-3 h-3"/>
+                    <ChevronsUpDown className="w-3 h-3" />
                   </Button>
                 </DropdownMenuTrigger>
-                <DropdownMenuContent align="end" portalProps={{container: bubbleMenuRef.current}}>
+                <DropdownMenuContent align="end" portalProps={{ container: bubbleMenuRef.current }}>
                   <DropdownMenuItem onClick={() => editor.chain().focus().addColumnAfter().run()}>Add a column</DropdownMenuItem>
                   <DropdownMenuItem onClick={() => editor.chain().focus().addRowAfter().run()}>Add a row</DropdownMenuItem>
                   <DropdownMenuSeparator />
@@ -364,7 +364,7 @@ const EditComponent = forwardRef((props: any, ref) => {
           </div>
         </BubbleMenu>}
         <EditorContent editor={editor} />
-        <MediaDialog ref={mediaDialogRef} selected={[]} onSubmit={handleMediaDialogSubmit}/>
+        <MediaDialog ref={mediaDialogRef} selected={[]} onSubmit={handleMediaDialogSubmit} />
       </div>
     </>
   )

From 2cbdde8e16f2689a68aa51b3b3eab4d3ba862441 Mon Sep 17 00:00:00 2001
From: Ryan Gittings <ryan@gittings.studio>
Date: Wed, 5 Mar 2025 16:15:57 +0000
Subject: [PATCH 15/95] Fix

---
 fields/core/rich-text/index.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fields/core/rich-text/index.tsx b/fields/core/rich-text/index.tsx
index d34af82f..f1d44d2f 100644
--- a/fields/core/rich-text/index.tsx
+++ b/fields/core/rich-text/index.tsx
@@ -15,15 +15,15 @@ const read = (value: any, field: Field, config: Record<string, any>) => {
 
   const prefixInput = field.options?.input ?? config.object.media?.input;
   const prefixOutput = field.options?.output ?? config.object.media?.output;
-  
+
   return htmlSwapPrefix(html, prefixOutput, prefixInput, true);
 };
 
 const write = (value: any, field: Field, config: Record<string, any>) => {
-  let content = value;
-  
+  let content = value || '';
+
   content = rawToRelativeUrls(config.owner, config.repo, config.branch, content);
-  
+
   const prefixInput = field.options?.input ?? config.object.media?.input;
   const prefixOutput = field.options?.output ?? config.object.media?.output;
 
@@ -36,7 +36,7 @@ const write = (value: any, field: Field, config: Record<string, any>) => {
     });
     turndownService.use([tables, strikethrough]);
     turndownService.addRule("retain-html", {
-      filter: (node: any, options: any)  => (
+      filter: (node: any, options: any) => (
         (
           node.nodeName === "IMG" && (node.getAttribute("width") || node.getAttribute("height"))
         ) ||
@@ -50,10 +50,10 @@ const write = (value: any, field: Field, config: Record<string, any>) => {
     // We need to strip <colgroup> and <col> tags otherwise turndown won't convert tables
     content = content.replace(/<colgroup>.*?<\/colgroup>/g, '');
 
-    content = turndownService.turndown(content);    
+    content = turndownService.turndown(content);
   }
 
   return content;
 };
 
-export { EditComponent, ViewComponent, read, write};
\ No newline at end of file
+export { EditComponent, ViewComponent, read, write };
\ No newline at end of file

From 3dac3a856b380d0d65b2a3ee4067caf15db61843 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 8 Mar 2025 10:14:33 +0800
Subject: [PATCH 16/95] New select field (WIP)

---
 components/entry/entry-form.tsx             |   4 +-
 fields/core/autocomplete/edit-component.css |  76 ++++
 fields/core/autocomplete/edit-component.tsx | 201 +++++++++
 fields/core/autocomplete/index.tsx          |  26 ++
 lib/schema.ts                               |  31 +-
 package-lock.json                           | 472 +++++++++++++++++++-
 package.json                                |   1 +
 types/field.ts                              |   2 +-
 8 files changed, 782 insertions(+), 31 deletions(-)
 create mode 100644 fields/core/autocomplete/edit-component.css
 create mode 100644 fields/core/autocomplete/edit-component.tsx
 create mode 100644 fields/core/autocomplete/index.tsx

diff --git a/components/entry/entry-form.tsx b/components/entry/entry-form.tsx
index 38c8dc00..9460c85e 100644
--- a/components/entry/entry-form.tsx
+++ b/components/entry/entry-form.tsx
@@ -187,7 +187,7 @@ const ListField = ({
                   size="sm"
                   onClick={() => {
                     append(field.type === "object"
-                      ? initializeState(field.fields, {}, true)
+                      ? initializeState(field.fields, {})
                       : getDefaultValue(field)
                     );
                   }}
@@ -263,7 +263,7 @@ const EntryForm = ({
   }, [fields]);
 
   const defaultValues = useMemo(() => {
-    return initializeState(fields, sanitizeObject(contentObject), true);
+    return initializeState(fields, sanitizeObject(contentObject));
   }, [fields, contentObject]);
 
   const form = useForm({
diff --git a/fields/core/autocomplete/edit-component.css b/fields/core/autocomplete/edit-component.css
new file mode 100644
index 00000000..f74dc577
--- /dev/null
+++ b/fields/core/autocomplete/edit-component.css
@@ -0,0 +1,76 @@
+.react-select__control {
+  @apply !min-h-10 !rounded-md !border-input !bg-background !ring-offset-background !transition-none !cursor-pointer !box-border !px-3 !py-2;
+}
+
+.react-select__control--is-focused {
+  @apply !outline-none !ring-2 !ring-ring !ring-offset-2;
+}
+
+.react-select__placeholder {
+  @apply !text-muted-foreground !mx-0;
+}
+
+.react-select__value-container {
+  @apply !p-0 !m-0 !leading-none !text-foreground;
+}
+
+.react-select__value-container--is-multi {
+  @apply flex gap-1.5 !-my-[1px];
+}
+
+.react-select__single-value {
+  @apply !mx-0 !text-foreground;
+}
+
+.react-select__input-container {
+  @apply !m-0 !p-0 !text-foreground;
+}
+
+.react-select__indicator-separator {
+  @apply !hidden;
+}
+
+.react-select__clear-indicator,
+.react-select__dropdown-indicator {
+  @apply !text-foreground opacity-50 !p-0 !transition-opacity;
+}
+
+.react-select__clear-indicator {
+  @apply hover:!opacity-100 mr-1;
+}
+
+.react-select__multi-value {
+  @apply !rounded-full !border !bg-accent !m-0 !inline-flex !items-center !p-0 !font-medium !text-inherit;
+}
+
+.react-select__multi-value__label {
+  @apply !py-1 !pl-2 !pr-0 !text-inherit;
+}
+
+.react-select__multi-value__remove {
+  @apply  !py-1 !px-1 !text-foreground !opacity-50 hover:!opacity-100 !bg-transparent !transition-opacity;
+}
+
+.react-select__menu {
+  @apply !rounded-md !border !border-input !shadow-md !bg-popover !text-popover-foreground !max-h-96 !min-w-[8rem];
+}
+
+.react-select__menu-list {
+  @apply !p-1;
+}
+
+.react-select__option {
+  @apply !rounded-sm !py-1.5 !pl-8 !pr-2 !text-sm hover:!bg-accent;
+}
+
+.react-select__menu-list--is-multi .react-select__option {
+  @apply !pl-2;
+}
+
+.react-select__option--is-focused {
+  @apply !bg-accent;
+}
+
+.react-select__option--is-selected {
+  @apply !bg-transparent !text-foreground bg-no-repeat bg-[url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IiMwYTBhMGEiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBjbGFzcz0ibHVjaWRlIGx1Y2lkZS1jaGVjayI+PHBhdGggZD0iTTIwIDYgOSAxN2wtNS01Ii8+PC9zdmc+")] dark:bg-[url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IiNmZmZmZmYiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBjbGFzcz0ibHVjaWRlIGx1Y2lkZS1jaGVjayI+PHBhdGggZD0iTTIwIDYgOSAxN2wtNS01Ii8+PC9zdmc+")] bg-[left_0.5rem_center] bg-[length:16px_16px];
+}
\ No newline at end of file
diff --git a/fields/core/autocomplete/edit-component.tsx b/fields/core/autocomplete/edit-component.tsx
new file mode 100644
index 00000000..0a59996a
--- /dev/null
+++ b/fields/core/autocomplete/edit-component.tsx
@@ -0,0 +1,201 @@
+"use client";
+
+import { forwardRef, useMemo, useState, useCallback, useEffect } from "react";
+import "./edit-component.css";
+import Select, { components } from "react-select"
+import CreatableSelect from 'react-select/creatable';
+import AsyncSelect from 'react-select/async';
+import AsyncCreatableSelect from 'react-select/async-creatable';
+import { ChevronDown, X } from "lucide-react";
+
+const DropdownIndicator = (props: any) => {
+  return (
+    <components.DropdownIndicator {...props}>
+      <ChevronDown className="w-4 h-4"/>
+    </components.DropdownIndicator>
+  );
+};
+
+const ClearIndicator = (props: any) => {
+  return (
+    <components.ClearIndicator {...props}>
+      <X className="w-4 h-4" />
+    </components.ClearIndicator>
+  );
+};
+
+const MultiValueRemove = (props: any) => {
+  return (
+    <components.MultiValueRemove {...props}>
+      <X className="w-3 h-3 stroke-[2.5]" />
+    </components.MultiValueRemove>
+  );
+};
+
+const EditComponent = forwardRef((props: any, ref: any) => {
+  const { value, field, onChange } = props;
+  const [isMounted, setIsMounted] = useState(false);
+  const [inputValue, setInputValue] = useState('');
+
+  useEffect(() => {
+    setIsMounted(true);
+  }, []);
+
+  // Only create static options if not using fetch
+  const options = useMemo(() => 
+    !field.options?.fetch && field.options?.values
+      ? field.options.values.map((option: any) => {
+          if (typeof option === "object") {
+            return { value: option.value, label: option.label };
+          }
+          return { value: option, label: option };
+        }) 
+      : [], 
+    [field.options?.values, field.options?.fetch]
+  );
+
+  // Handle fetching options
+  const loadOptions = useCallback(
+    async (inputValue: string) => {
+      if (!field.options?.fetch?.url) return [];
+      
+      try {
+        // Process URL - either replace template or add query parameter
+        let urlString = field.options.fetch.url;
+        
+        // Check if URL has a template pattern like {input}
+        if (urlString.includes('{input}')) {
+          // Replace the template with the encoded input value
+          urlString = urlString.replace('{input}', encodeURIComponent(inputValue));
+        } else {
+          // Add query parameter to URL
+          const url = new URL(urlString);
+          if (inputValue) {
+            url.searchParams.append(field.options.fetch.queryParam || 'q', inputValue);
+          }
+          urlString = url.toString();
+        }
+        
+        const response = await fetch(urlString, {
+          method: field.options.fetch.method || 'GET',
+          headers: field.options.fetch.headers || {},
+        });
+        
+        if (!response.ok) throw new Error('Failed to fetch options');
+        
+        const data = await response.json();
+        
+        // Extract options from response using the provided path
+        let results = data;
+        if (field.options.fetch.resultsPath) {
+          const path = field.options.fetch.resultsPath.split('.');
+          for (const segment of path) {
+            results = results[segment];
+          }
+        }
+        
+        // Map results to option format
+        return results.map((item: any) => {
+          const valuePath = field.options.fetch.valuePath || 'id';
+          const labelPath = field.options.fetch.labelPath || 'name';
+          
+          const getValue = (obj: any, path: string) => {
+            const parts = path.split('.');
+            return parts.reduce((o, key) => (o && o[key] !== undefined) ? o[key] : null, obj);
+          };
+          
+          return {
+            value: getValue(item, valuePath),
+            label: getValue(item, labelPath),
+          };
+        });
+      } catch (error) {
+        console.error('Error loading options:', error);
+        return [];
+      }
+    },
+    [field.options?.fetch]
+  );
+
+  // Internal state to manage the react-select format
+  const [selectedOptions, setSelectedOptions] = useState(() => {
+    if (field.list) {
+      if (!value) return [];
+      
+      // Handle nested array structure
+      const valueToUse = Array.isArray(value[0]) ? value[0] : value;
+      
+      // Map each value to an option object
+      return valueToUse.map((val: any) => {
+        const option = options.find((opt: any) => opt.value === val);
+        return option || { value: val, label: val };
+      });
+    } else {
+      if (!value) return null;
+      const option = options.find((opt: any) => opt.value === value);
+      return option || { value, label: value };
+    }
+  });
+
+  const handleChange = useCallback((newValue: any) => {
+    setSelectedOptions(newValue);
+    if (field.list) {
+      const values = newValue ? newValue.map((item: any) => item.value) : [];
+      onChange(values);
+    } else {
+      onChange(newValue ? newValue.value : null);
+    }
+  }, [onChange, field.list]);
+
+  const handleInputChange = useCallback((newValue: string) => {
+    setInputValue(newValue);
+  }, []);
+
+  if (!isMounted) return null;
+
+  // Determine which Select component to use based on options
+  let SelectComponent;
+  if (field.options?.fetch) {
+    SelectComponent = field.options?.creatable ? AsyncCreatableSelect : AsyncSelect;
+  } else {
+    SelectComponent = field.options?.creatable ? CreatableSelect : Select;
+  }
+
+  // Common props for all select variants
+  const selectProps = {
+    ref,
+    isMulti: field.list,
+    classNamePrefix: "react-select",
+    placeholder: field.options?.placeholder || "Select...",
+    components: { 
+      DropdownIndicator,
+      ClearIndicator,
+      MultiValueRemove
+    },
+    value: selectedOptions,
+    onChange: handleChange,
+    onInputChange: handleInputChange,
+    inputValue: inputValue,
+  };
+
+  // Add specific props based on component type
+  if (field.options?.fetch) {
+    return (
+      <SelectComponent
+        {...selectProps}
+        loadOptions={loadOptions}
+        defaultOptions={field.options.fetch.preloadOptions}
+        cacheOptions={field.options.fetch.cacheOptions !== false}
+      />
+    );
+  } else {
+    return (
+      <SelectComponent
+        {...selectProps}
+        options={options}
+      />
+    );
+  }
+});
+
+export { EditComponent };
\ No newline at end of file
diff --git a/fields/core/autocomplete/index.tsx b/fields/core/autocomplete/index.tsx
new file mode 100644
index 00000000..0cdd277b
--- /dev/null
+++ b/fields/core/autocomplete/index.tsx
@@ -0,0 +1,26 @@
+import { z } from "zod";
+import { Field } from "@/types/field";
+import { EditComponent } from "./edit-component";
+
+const schema = (field: Field) => {
+  let zodSchema;
+  
+  if (!field.options?.creatable && field.options?.values && Array.isArray(field.options.values)) {
+    const normalizedValues = field.options.values.map((item) => {
+      return typeof item === "object"
+        ? item.value
+        : item;
+    });
+    zodSchema = z.enum(normalizedValues as [string, ...string[]]);
+  } else {
+    zodSchema = z.string();
+  }
+
+  if (!field.required) zodSchema = zodSchema.optional();
+  
+  return zodSchema;
+};
+
+const supportsList = true;
+
+export { schema, EditComponent, supportsList };
\ No newline at end of file
diff --git a/lib/schema.ts b/lib/schema.ts
index 45ad7284..50902352 100644
--- a/lib/schema.ts
+++ b/lib/schema.ts
@@ -21,13 +21,17 @@ const deepMap = (
       
       // TOOD: do we want to check for undefined or null?
       if (field.list) {
-        result[field.name] = Array.isArray(value)
-          ? value.map(item =>
-              field.type === "object"
-                ? traverse(item, field.fields || [])
-                : apply(item, field)
-            )
-          : [];
+        if (value === undefined) {
+          result[field.name] = apply(value, field);
+        } else {
+          result[field.name] = Array.isArray(value)
+            ? value.map(item =>
+                field.type === "object"
+                  ? traverse(item, field.fields || [])
+                  : apply(item, field)
+              )
+            : [];
+        }
       } else if (field.type === "object") {
         result[field.name] = value !== undefined
           ? traverse(value, field.fields || [])
@@ -46,18 +50,19 @@ const deepMap = (
 // Create an initial state for an entry based on the schema fields and content
 const initializeState = (
   fields: Field[] | undefined,
-  contentObject: Record<string, any> = {},
-  addDefaultEntryToLists: boolean = true,
-  nestArrays: boolean = false
+  contentObject: Record<string, any> = {}
 ): Record<string, any> => {
   if (!fields) return {};
-
+  
   return deepMap(contentObject, fields, (value, field) => {
     let appliedValue = value;
     if (value === undefined) {
-      appliedValue = field.list && addDefaultEntryToLists ? [getDefaultValue(field)] : getDefaultValue(field);
+      appliedValue = field.list
+        ? (typeof field.list === "object" && field.list.default)
+          ? field.list.default
+          : [getDefaultValue(field)]
+        : getDefaultValue(field);
     }
-    if (field.list && nestArrays) appliedValue = { value: appliedValue}
     return appliedValue;
   });
 };
diff --git a/package-lock.json b/package-lock.json
index 05132ec2..fcc553e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -72,6 +72,7 @@
         "react-day-picker": "^8.10.1",
         "react-dom": "^18.3.1",
         "react-hook-form": "^7.51.5",
+        "react-select": "^5.10.0",
         "resend": "^3.5.0",
         "slugify": "^1.6.6",
         "sonner": "^1.4.41",
@@ -108,6 +109,82 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@babel/code-frame": {
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
+      "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
+      "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.26.9"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@babel/runtime": {
       "version": "7.25.0",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz",
@@ -119,6 +196,60 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/template": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
+      "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse/node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
+      "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@codemirror/autocomplete": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.0.tgz",
@@ -568,6 +699,129 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@emotion/babel-plugin": {
+      "version": "11.13.5",
+      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz",
+      "integrity": "sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/runtime": "^7.18.3",
+        "@emotion/hash": "^0.9.2",
+        "@emotion/memoize": "^0.9.0",
+        "@emotion/serialize": "^1.3.3",
+        "babel-plugin-macros": "^3.1.0",
+        "convert-source-map": "^1.5.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-root": "^1.1.0",
+        "source-map": "^0.5.7",
+        "stylis": "4.2.0"
+      }
+    },
+    "node_modules/@emotion/babel-plugin/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@emotion/cache": {
+      "version": "11.14.0",
+      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz",
+      "integrity": "sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==",
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/memoize": "^0.9.0",
+        "@emotion/sheet": "^1.4.0",
+        "@emotion/utils": "^1.4.2",
+        "@emotion/weak-memoize": "^0.4.0",
+        "stylis": "4.2.0"
+      }
+    },
+    "node_modules/@emotion/hash": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz",
+      "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==",
+      "license": "MIT"
+    },
+    "node_modules/@emotion/memoize": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz",
+      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
+      "license": "MIT"
+    },
+    "node_modules/@emotion/react": {
+      "version": "11.14.0",
+      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
+      "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "@emotion/babel-plugin": "^11.13.5",
+        "@emotion/cache": "^11.14.0",
+        "@emotion/serialize": "^1.3.3",
+        "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0",
+        "@emotion/utils": "^1.4.2",
+        "@emotion/weak-memoize": "^0.4.0",
+        "hoist-non-react-statics": "^3.3.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@emotion/serialize": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.3.tgz",
+      "integrity": "sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==",
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/hash": "^0.9.2",
+        "@emotion/memoize": "^0.9.0",
+        "@emotion/unitless": "^0.10.0",
+        "@emotion/utils": "^1.4.2",
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/@emotion/sheet": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz",
+      "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==",
+      "license": "MIT"
+    },
+    "node_modules/@emotion/unitless": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz",
+      "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==",
+      "license": "MIT"
+    },
+    "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz",
+      "integrity": "sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/@emotion/utils": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.2.tgz",
+      "integrity": "sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==",
+      "license": "MIT"
+    },
+    "node_modules/@emotion/weak-memoize": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz",
+      "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==",
+      "license": "MIT"
+    },
     "node_modules/@esbuild-kit/core-utils": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.3.2.tgz",
@@ -4572,17 +4826,21 @@
         "undici-types": "~5.26.4"
       }
     },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+      "license": "MIT"
+    },
     "node_modules/@types/prop-types": {
       "version": "15.7.12",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
-      "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==",
-      "devOptional": true
+      "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q=="
     },
     "node_modules/@types/react": {
       "version": "18.3.3",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
       "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
-      "devOptional": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -4597,6 +4855,15 @@
         "@types/react": "*"
       }
     },
+    "node_modules/@types/react-transition-group": {
+      "version": "4.4.12",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz",
+      "integrity": "sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*"
+      }
+    },
     "node_modules/@types/turndown": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/@types/turndown/-/turndown-5.0.5.tgz",
@@ -5149,6 +5416,21 @@
         "deep-equal": "^2.0.5"
       }
     },
+    "node_modules/babel-plugin-macros": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "cosmiconfig": "^7.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">=10",
+        "npm": ">=6"
+      }
+    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -5236,7 +5518,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -5763,6 +6044,37 @@
         "proto-list": "~1.2.1"
       }
     },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "license": "MIT"
+    },
+    "node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/crelt": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
@@ -5795,8 +6107,7 @@
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "devOptional": true
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
     },
     "node_modules/damerau-levenshtein": {
       "version": "1.0.8",
@@ -5876,7 +6187,6 @@
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
       "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -6017,6 +6327,16 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/dom-helpers": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
+      }
+    },
     "node_modules/dom-serializer": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
@@ -6283,6 +6603,15 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
     "node_modules/es-abstract": {
       "version": "1.23.3",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
@@ -7031,6 +7360,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+      "license": "MIT"
+    },
     "node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -7426,6 +7761,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "react-is": "^16.7.0"
+      }
+    },
     "node_modules/html-to-text": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.5.tgz",
@@ -7472,7 +7816,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -7577,6 +7920,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "license": "MIT"
+    },
     "node_modules/is-async-function": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
@@ -8029,12 +8378,30 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
       "dev": true
     },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "license": "MIT"
+    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -8305,6 +8672,12 @@
         "memfs": "3.5.3"
       }
     },
+    "node_modules/memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==",
+      "license": "MIT"
+    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -8358,7 +8731,6 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/mz": {
@@ -11316,7 +11688,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -11324,6 +11695,24 @@
         "node": ">=6"
       }
     },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/parseley": {
       "version": "0.12.1",
       "resolved": "https://registry.npmjs.org/parseley/-/parseley-0.12.1.tgz",
@@ -11386,7 +11775,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -11617,7 +12005,6 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -11895,8 +12282,7 @@
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
     "node_modules/react-promise-suspense": {
       "version": "0.3.4",
@@ -11956,6 +12342,27 @@
         }
       }
     },
+    "node_modules/react-select": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.10.0.tgz",
+      "integrity": "sha512-k96gw+i6N3ExgDwPIg0lUPmexl1ygPe6u5BdQFNBhkpbwroIgCNXdubtIzHfThYXYYTubwOBafoMnn7ruEP1xA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.12.0",
+        "@emotion/cache": "^11.4.0",
+        "@emotion/react": "^11.8.1",
+        "@floating-ui/dom": "^1.0.1",
+        "@types/react-transition-group": "^4.4.0",
+        "memoize-one": "^6.0.0",
+        "prop-types": "^15.6.0",
+        "react-transition-group": "^4.3.0",
+        "use-isomorphic-layout-effect": "^1.2.0"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/react-style-singleton": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz",
@@ -11978,6 +12385,22 @@
         }
       }
     },
+    "node_modules/react-transition-group": {
+      "version": "4.4.5",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.6.0",
+        "react-dom": ">=16.6.0"
+      }
+    },
     "node_modules/read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -12077,7 +12500,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -12610,6 +13032,12 @@
         }
       }
     },
+    "node_modules/stylis": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
+      "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==",
+      "license": "MIT"
+    },
     "node_modules/sucrase": {
       "version": "3.35.0",
       "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
@@ -12993,6 +13421,20 @@
         "react": ">=16.8.0"
       }
     },
+    "node_modules/use-isomorphic-layout-effect": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.0.tgz",
+      "integrity": "sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/use-sidecar": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",
diff --git a/package.json b/package.json
index 35612a14..36520e10 100644
--- a/package.json
+++ b/package.json
@@ -79,6 +79,7 @@
     "react-day-picker": "^8.10.1",
     "react-dom": "^18.3.1",
     "react-hook-form": "^7.51.5",
+    "react-select": "^5.10.0",
     "resend": "^3.5.0",
     "slugify": "^1.6.6",
     "sonner": "^1.4.41",
diff --git a/types/field.ts b/types/field.ts
index c7f4ba7d..3aa85c66 100644
--- a/types/field.ts
+++ b/types/field.ts
@@ -4,7 +4,7 @@ export type Field = {
   description?: string | null;
   type: "boolean" | "code" | "date" | "image" | "number" | "object" | "rich-text" | "select" | "string" | "text" | string;
   default?: any;
-  list?: boolean | { min?: number; max?: number };
+  list?: boolean | { min?: number; max?: number; default?: any };
   hidden?: boolean | null;
   required?: boolean | null;
   pattern?: string | { regex: string; message?: string };

From a6ab6470bf2289c02c7bb99c3bf6b6d7b5fd3124 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 8 Mar 2025 12:41:26 +0800
Subject: [PATCH 17/95] Added options and cleaned up PR

---
 fields/core/uuid/edit-component.tsx | 47 +++++++++++++++++++++++++++--
 fields/core/uuid/index.tsx          |  4 +--
 package-lock.json                   | 14 +++++++++
 package.json                        |  1 +
 4 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/fields/core/uuid/edit-component.tsx b/fields/core/uuid/edit-component.tsx
index 61c22053..1446c247 100644
--- a/fields/core/uuid/edit-component.tsx
+++ b/fields/core/uuid/edit-component.tsx
@@ -2,9 +2,52 @@
 
 import { forwardRef } from "react";
 import { Input } from "@/components/ui/input";
+import { Button } from "@/components/ui/button";
+import { v4 as uuidv4 } from 'uuid';
+import { RefreshCcw } from "lucide-react";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 
 const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>) => {
-  return <Input {...props} ref={ref} className="text-base" />;
+  const { value, field, onChange } = props;
+
+  const generateNewUUID = () => {
+    onChange(uuidv4());
+  };
+
+  return (
+    <div className="flex gap-2">
+      <Input 
+        {...props} 
+        ref={ref} 
+        className="text-base" 
+        readOnly={!field?.options?.editable}
+      />
+      {field?.options?.generate !== false && (
+        <TooltipProvider>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Button 
+                type="button" 
+                variant="outline" 
+                onClick={generateNewUUID}
+                className="shrink-0"
+              >
+                <RefreshCcw className="w-4 h-4" />
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>
+              <p>Generate new UUID</p>
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+      )}
+    </div>
+  );
 });
 
-export { EditComponent };
+export { EditComponent };
\ No newline at end of file
diff --git a/fields/core/uuid/index.tsx b/fields/core/uuid/index.tsx
index 4f8e6e29..fd512fc0 100644
--- a/fields/core/uuid/index.tsx
+++ b/fields/core/uuid/index.tsx
@@ -7,9 +7,9 @@ const defaultValue = (): string => {
 };
 
 const schema = (_: Field) => {
-  let zodSchema = z.coerce.string();
+  let zodSchema = z.coerce.string().uuid();
 
   return zodSchema;
 };
 
-export { EditComponent, defaultValue, schema };
+export { EditComponent, defaultValue, schema };
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 05132ec2..bf234fc3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -79,6 +79,7 @@
         "tailwindcss-animate": "^1.0.7",
         "turndown": "^7.2.0",
         "use-debounce": "^10.0.0",
+        "uuid": "^11.1.0",
         "yaml": "^2.4.2",
         "zod": "^3.23.8"
       },
@@ -13027,6 +13028,19 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
+    "node_modules/uuid": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/esm/bin/uuid"
+      }
+    },
     "node_modules/w3c-keyname": {
       "version": "2.2.8",
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
diff --git a/package.json b/package.json
index 35612a14..5b82a144 100644
--- a/package.json
+++ b/package.json
@@ -86,6 +86,7 @@
     "tailwindcss-animate": "^1.0.7",
     "turndown": "^7.2.0",
     "use-debounce": "^10.0.0",
+    "uuid": "^11.1.0",
     "yaml": "^2.4.2",
     "zod": "^3.23.8"
   },

From a6c2b7caac31cb69d91d8be8974ca157992d861d Mon Sep 17 00:00:00 2001
From: Ryan Gittings <ryan@gittings.studio>
Date: Mon, 10 Mar 2025 10:26:40 +0000
Subject: [PATCH 18/95] Fixes

---
 components/entry/entry-form.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/entry/entry-form.tsx b/components/entry/entry-form.tsx
index 0ded3e2d..bfe71a12 100644
--- a/components/entry/entry-form.tsx
+++ b/components/entry/entry-form.tsx
@@ -115,7 +115,8 @@ const ListField = ({
 
   useEffect(() => {
     const defaultValue = getDefaultValue(field);
-    if (typeof defaultValue === "object" && Object.values(defaultValue).filter(n => n).length === 0) {
+
+    if (field.list?.min == undefined) {
       return;
     }
 

From 72406859ffa259fd1a65907f0983632c3562deba Mon Sep 17 00:00:00 2001
From: Ryan Gittings <ryan@gittings.studio>
Date: Mon, 10 Mar 2025 10:31:34 +0000
Subject: [PATCH 19/95] Fixes

---
 components/entry/entry-form.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/entry/entry-form.tsx b/components/entry/entry-form.tsx
index bfe71a12..d1f95805 100644
--- a/components/entry/entry-form.tsx
+++ b/components/entry/entry-form.tsx
@@ -116,7 +116,7 @@ const ListField = ({
   useEffect(() => {
     const defaultValue = getDefaultValue(field);
 
-    if (field.list?.min == undefined) {
+    if ((field.list && typeof field.list === 'object' && field.list.min === undefined) || field.list === true) {
       return;
     }
 

From 58c61f58344f6532f6783413200471a9f6a8fe60 Mon Sep 17 00:00:00 2001
From: Ryan Gittings <ryan@gittings.studio>
Date: Mon, 10 Mar 2025 11:03:36 +0000
Subject: [PATCH 20/95] Fixes

---
 components/entry/entry-form.tsx          | 4 ++--
 fields/core/rich-text/edit-component.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/entry/entry-form.tsx b/components/entry/entry-form.tsx
index d1f95805..0186612d 100644
--- a/components/entry/entry-form.tsx
+++ b/components/entry/entry-form.tsx
@@ -114,12 +114,12 @@ const ListField = ({
   const hasAppended = useRef(false);
 
   useEffect(() => {
-    const defaultValue = getDefaultValue(field);
-
     if ((field.list && typeof field.list === 'object' && field.list.min === undefined) || field.list === true) {
       return;
     }
 
+    const defaultValue = getDefaultValue(field);
+
     if (arrayFields.length === 0 && !hasAppended.current && defaultValue) {
       append(defaultValue);
       hasAppended.current = true;
diff --git a/fields/core/rich-text/edit-component.tsx b/fields/core/rich-text/edit-component.tsx
index 1d6a27d1..4363567d 100644
--- a/fields/core/rich-text/edit-component.tsx
+++ b/fields/core/rich-text/edit-component.tsx
@@ -76,7 +76,7 @@ const EditComponent = forwardRef((props: any, ref) => {
     : undefined;
 
   const editor = useEditor({
-    immediatelyRender: false,
+    immediatelyRender: true,
     extensions: [
       StarterKit.configure({
         dropcursor: { width: 2 }

From 600e4073c8c9d309151018d679b58dc1e6f895be Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 11 Mar 2025 17:44:54 +0800
Subject: [PATCH 21/95] Working fetch on new select field

---
 fields/core/autocomplete/edit-component.tsx | 273 ++++++++------------
 fields/core/autocomplete/index.tsx          |   8 +-
 2 files changed, 109 insertions(+), 172 deletions(-)

diff --git a/fields/core/autocomplete/edit-component.tsx b/fields/core/autocomplete/edit-component.tsx
index 0a59996a..dc4882ac 100644
--- a/fields/core/autocomplete/edit-component.tsx
+++ b/fields/core/autocomplete/edit-component.tsx
@@ -2,200 +2,139 @@
 
 import { forwardRef, useMemo, useState, useCallback, useEffect } from "react";
 import "./edit-component.css";
-import Select, { components } from "react-select"
-import CreatableSelect from 'react-select/creatable';
-import AsyncSelect from 'react-select/async';
-import AsyncCreatableSelect from 'react-select/async-creatable';
+import Select, { components } from "react-select";
+import CreatableSelect from "react-select/creatable";
+import AsyncSelect from "react-select/async";
+import AsyncCreatableSelect from "react-select/async-creatable";
 import { ChevronDown, X } from "lucide-react";
-
-const DropdownIndicator = (props: any) => {
-  return (
-    <components.DropdownIndicator {...props}>
-      <ChevronDown className="w-4 h-4"/>
-    </components.DropdownIndicator>
-  );
-};
-
-const ClearIndicator = (props: any) => {
-  return (
-    <components.ClearIndicator {...props}>
-      <X className="w-4 h-4" />
-    </components.ClearIndicator>
-  );
-};
-
-const MultiValueRemove = (props: any) => {
-  return (
-    <components.MultiValueRemove {...props}>
-      <X className="w-3 h-3 stroke-[2.5]" />
-    </components.MultiValueRemove>
-  );
+import { safeAccess } from "@/lib/schema";
+
+const DropdownIndicator = (props: any) => (
+  <components.DropdownIndicator {...props}>
+    <ChevronDown className="w-4 h-4" />
+  </components.DropdownIndicator>
+);
+
+const ClearIndicator = (props: any) => (
+  <components.ClearIndicator {...props}>
+    <X className="w-4 h-4" />
+  </components.ClearIndicator>
+);
+
+const MultiValueRemove = (props: any) => (
+  <components.MultiValueRemove {...props}>
+    <X className="w-3 h-3 stroke-[2.5]" />
+  </components.MultiValueRemove>
+);
+
+type FetchConfig = {
+  url: string;
+  method?: string;
+  query?: string;
+  headers?: Record<string, string>;
+  results?: string;
+  value?: string;
+  label?: string;
+  minlength?: number;
 };
 
 const EditComponent = forwardRef((props: any, ref: any) => {
   const { value, field, onChange } = props;
   const [isMounted, setIsMounted] = useState(false);
-  const [inputValue, setInputValue] = useState('');
-
-  useEffect(() => {
-    setIsMounted(true);
-  }, []);
-
-  // Only create static options if not using fetch
-  const options = useMemo(() => 
-    !field.options?.fetch && field.options?.values
-      ? field.options.values.map((option: any) => {
-          if (typeof option === "object") {
-            return { value: option.value, label: option.label };
-          }
-          return { value: option, label: option };
-        }) 
-      : [], 
+
+  useEffect(() => setIsMounted(true), []);
+
+  const staticOptions = useMemo(
+    () =>
+      !field.options?.fetch && field.options?.values
+        ? field.options.values.map((opt: any) =>
+            typeof opt === "object"
+              ? { value: opt.value, label: opt.label }
+              : { value: opt, label: opt }
+          )
+        : [],
     [field.options?.values, field.options?.fetch]
   );
 
-  // Handle fetching options
   const loadOptions = useCallback(
-    async (inputValue: string) => {
-      if (!field.options?.fetch?.url) return [];
-      
+    async (input: string) => {
+      const fetchConfig = field.options?.fetch as FetchConfig;
+      const minLength = fetchConfig?.minlength || 0;
+      if (!fetchConfig?.url || input.length < minLength) {
+        return [];
+      }
+
       try {
-        // Process URL - either replace template or add query parameter
-        let urlString = field.options.fetch.url;
-        
-        // Check if URL has a template pattern like {input}
-        if (urlString.includes('{input}')) {
-          // Replace the template with the encoded input value
-          urlString = urlString.replace('{input}', encodeURIComponent(inputValue));
-        } else {
-          // Add query parameter to URL
-          const url = new URL(urlString);
-          if (inputValue) {
-            url.searchParams.append(field.options.fetch.queryParam || 'q', inputValue);
-          }
-          urlString = url.toString();
-        }
-        
-        const response = await fetch(urlString, {
-          method: field.options.fetch.method || 'GET',
-          headers: field.options.fetch.headers || {},
+        const url = new URL(fetchConfig.url);
+        if (fetchConfig.query) url.searchParams.append(fetchConfig.query, input);
+        const response = await fetch(url, {
+          method: fetchConfig.method || "GET",
+          headers: fetchConfig.headers || {},
         });
-        
-        if (!response.ok) throw new Error('Failed to fetch options');
-        
+        if (!response.ok) throw new Error("Fetch failed");
         const data = await response.json();
-        
-        // Extract options from response using the provided path
-        let results = data;
-        if (field.options.fetch.resultsPath) {
-          const path = field.options.fetch.resultsPath.split('.');
-          for (const segment of path) {
-            results = results[segment];
-          }
-        }
-        
-        // Map results to option format
-        return results.map((item: any) => {
-          const valuePath = field.options.fetch.valuePath || 'id';
-          const labelPath = field.options.fetch.labelPath || 'name';
-          
-          const getValue = (obj: any, path: string) => {
-            const parts = path.split('.');
-            return parts.reduce((o, key) => (o && o[key] !== undefined) ? o[key] : null, obj);
-          };
-          
-          return {
-            value: getValue(item, valuePath),
-            label: getValue(item, labelPath),
-          };
-        });
+        const results = fetchConfig.results ? safeAccess(data, fetchConfig.results) : data;
+        if (!Array.isArray(results)) return [];
+        return results.map((item: any) => ({
+          value: fetchConfig.value ? safeAccess(item, fetchConfig.value) : item.id,
+          label: fetchConfig.label ? safeAccess(item, fetchConfig.label) : item.name,
+        }));
       } catch (error) {
-        console.error('Error loading options:', error);
+        console.error("Error loading options:", error);
         return [];
       }
     },
     [field.options?.fetch]
   );
 
-  // Internal state to manage the react-select format
   const [selectedOptions, setSelectedOptions] = useState(() => {
-    if (field.list) {
-      if (!value) return [];
-      
-      // Handle nested array structure
-      const valueToUse = Array.isArray(value[0]) ? value[0] : value;
-      
-      // Map each value to an option object
-      return valueToUse.map((val: any) => {
-        const option = options.find((opt: any) => opt.value === val);
-        return option || { value: val, label: val };
-      });
-    } else {
-      if (!value) return null;
-      const option = options.find((opt: any) => opt.value === value);
-      return option || { value, label: value };
+    if (field.options?.multiple) {
+      const values = Array.isArray(value) ? value : [];
+      return values.map((val: any) => staticOptions.find((opt: any) => opt.value === val) || { value: val, label: val });
     }
+    if (!value) return null;
+    return staticOptions.find((opt: any) => opt.value === value) || { value, label: value };
   });
 
-  const handleChange = useCallback((newValue: any) => {
-    setSelectedOptions(newValue);
-    if (field.list) {
-      const values = newValue ? newValue.map((item: any) => item.value) : [];
-      onChange(values);
-    } else {
-      onChange(newValue ? newValue.value : null);
-    }
-  }, [onChange, field.list]);
-
-  const handleInputChange = useCallback((newValue: string) => {
-    setInputValue(newValue);
-  }, []);
+  const handleChange = useCallback(
+    (newValue: any) => {
+      setSelectedOptions(newValue);
+      const output = field.options?.multiple
+        ? newValue ? newValue.map((item: any) => item.value) : []
+        : newValue ? newValue.value : null;
+      onChange(output);
+    },
+    [onChange, field.options?.multiple]
+  );
 
   if (!isMounted) return null;
 
-  // Determine which Select component to use based on options
-  let SelectComponent;
-  if (field.options?.fetch) {
-    SelectComponent = field.options?.creatable ? AsyncCreatableSelect : AsyncSelect;
-  } else {
-    SelectComponent = field.options?.creatable ? CreatableSelect : Select;
-  }
-
-  // Common props for all select variants
-  const selectProps = {
-    ref,
-    isMulti: field.list,
-    classNamePrefix: "react-select",
-    placeholder: field.options?.placeholder || "Select...",
-    components: { 
-      DropdownIndicator,
-      ClearIndicator,
-      MultiValueRemove
-    },
-    value: selectedOptions,
-    onChange: handleChange,
-    onInputChange: handleInputChange,
-    inputValue: inputValue,
-  };
-
-  // Add specific props based on component type
-  if (field.options?.fetch) {
-    return (
-      <SelectComponent
-        {...selectProps}
-        loadOptions={loadOptions}
-        defaultOptions={field.options.fetch.preloadOptions}
-        cacheOptions={field.options.fetch.cacheOptions !== false}
-      />
-    );
-  } else {
-    return (
-      <SelectComponent
-        {...selectProps}
-        options={options}
-      />
-    );
-  }
+  const SelectComponent = field.options?.fetch
+    ? field.options?.creatable
+      ? AsyncCreatableSelect
+      : AsyncSelect
+    : field.options?.creatable
+    ? CreatableSelect
+    : Select;
+
+  const fetchConfig = field.options?.fetch as FetchConfig;
+  return (
+    <SelectComponent
+      ref={ref}
+      isMulti={field.options?.multiple}
+      classNamePrefix="react-select"
+      placeholder={field.options?.placeholder || "Select..."}
+      components={{ DropdownIndicator, ClearIndicator, MultiValueRemove }}
+      value={selectedOptions}
+      onChange={handleChange}
+      {...(fetchConfig
+        ? {
+            loadOptions,
+            cacheOptions: false,
+          }
+        : { options: staticOptions })}
+    />
+  );
 });
 
 export { EditComponent };
\ No newline at end of file
diff --git a/fields/core/autocomplete/index.tsx b/fields/core/autocomplete/index.tsx
index 0cdd277b..b600626b 100644
--- a/fields/core/autocomplete/index.tsx
+++ b/fields/core/autocomplete/index.tsx
@@ -5,7 +5,7 @@ import { EditComponent } from "./edit-component";
 const schema = (field: Field) => {
   let zodSchema;
   
-  if (!field.options?.creatable && field.options?.values && Array.isArray(field.options.values)) {
+  if (!field.options?.creatable && !field.options?.fetch && field.options?.values && Array.isArray(field.options.values)) {
     const normalizedValues = field.options.values.map((item) => {
       return typeof item === "object"
         ? item.value
@@ -13,7 +13,7 @@ const schema = (field: Field) => {
     });
     zodSchema = z.enum(normalizedValues as [string, ...string[]]);
   } else {
-    zodSchema = z.string();
+    zodSchema = z.coerce.string();
   }
 
   if (!field.required) zodSchema = zodSchema.optional();
@@ -21,6 +21,4 @@ const schema = (field: Field) => {
   return zodSchema;
 };
 
-const supportsList = true;
-
-export { schema, EditComponent, supportsList };
\ No newline at end of file
+export { schema, EditComponent };
\ No newline at end of file

From 292180ec0d07674bb4c0a1034dd331e1124e6057 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 11 Mar 2025 18:11:14 +0800
Subject: [PATCH 22/95] Adding templates for value and label

---
 fields/core/autocomplete/edit-component.tsx | 19 +++++++++++++++----
 fields/core/autocomplete/index.tsx          |  2 ++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/fields/core/autocomplete/edit-component.tsx b/fields/core/autocomplete/edit-component.tsx
index dc4882ac..13551cbd 100644
--- a/fields/core/autocomplete/edit-component.tsx
+++ b/fields/core/autocomplete/edit-component.tsx
@@ -9,6 +9,13 @@ import AsyncCreatableSelect from "react-select/async-creatable";
 import { ChevronDown, X } from "lucide-react";
 import { safeAccess } from "@/lib/schema";
 
+const processTemplate = (template: string, item: any): string => {
+  return template.replace(/\{([^}]+)\}/g, (_, path) => {
+    const value = safeAccess(item, path);
+    return value !== undefined ? String(value) : '';
+  });
+};
+
 const DropdownIndicator = (props: any) => (
   <components.DropdownIndicator {...props}>
     <ChevronDown className="w-4 h-4" />
@@ -76,8 +83,12 @@ const EditComponent = forwardRef((props: any, ref: any) => {
         const results = fetchConfig.results ? safeAccess(data, fetchConfig.results) : data;
         if (!Array.isArray(results)) return [];
         return results.map((item: any) => ({
-          value: fetchConfig.value ? safeAccess(item, fetchConfig.value) : item.id,
-          label: fetchConfig.label ? safeAccess(item, fetchConfig.label) : item.name,
+          value: fetchConfig.value ? 
+            (fetchConfig.value.includes('{') ? processTemplate(fetchConfig.value, item) : safeAccess(item, fetchConfig.value))
+            : item.id,
+          label: fetchConfig.label ?
+            (fetchConfig.label.includes('{') ? processTemplate(fetchConfig.label, item) : safeAccess(item, fetchConfig.label))
+            : item.name,
         }));
       } catch (error) {
         console.error("Error loading options:", error);
@@ -90,10 +101,10 @@ const EditComponent = forwardRef((props: any, ref: any) => {
   const [selectedOptions, setSelectedOptions] = useState(() => {
     if (field.options?.multiple) {
       const values = Array.isArray(value) ? value : [];
-      return values.map((val: any) => staticOptions.find((opt: any) => opt.value === val) || { value: val, label: val });
+      return values.map((val: any) => ({ value: val, label: val }));
     }
     if (!value) return null;
-    return staticOptions.find((opt: any) => opt.value === value) || { value, label: value };
+    return { value: value, label: value };
   });
 
   const handleChange = useCallback(
diff --git a/fields/core/autocomplete/index.tsx b/fields/core/autocomplete/index.tsx
index b600626b..3280098c 100644
--- a/fields/core/autocomplete/index.tsx
+++ b/fields/core/autocomplete/index.tsx
@@ -16,6 +16,8 @@ const schema = (field: Field) => {
     zodSchema = z.coerce.string();
   }
 
+  if (field.options?.multiple) zodSchema = z.array(zodSchema);
+  
   if (!field.required) zodSchema = zodSchema.optional();
   
   return zodSchema;

From 970960f960c77563844e06589e8d3594e60f9101 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 11 Mar 2025 22:39:18 +0800
Subject: [PATCH 23/95] Polished animations, fixed validation of multiple
 fields

---
 components/ui/form.tsx                      | 46 +++++++++++++-----
 fields/core/autocomplete/edit-component.css | 13 ++++++
 fields/core/autocomplete/edit-component.tsx | 52 +++++++++++++++++++--
 fields/core/autocomplete/index.tsx          |  2 +-
 4 files changed, 95 insertions(+), 18 deletions(-)

diff --git a/components/ui/form.tsx b/components/ui/form.tsx
index fbe37485..3e10fd8e 100644
--- a/components/ui/form.tsx
+++ b/components/ui/form.tsx
@@ -146,25 +146,47 @@ const FormMessage = React.forwardRef<
 >(({ className, children, ...props }, ref) => {
   const { error, formMessageId } = useFormField()
   
-  const body = error
-    ? error.root
-      ? String(error?.root?.message)
-      : String(error?.message)
-    : children
-
-  if (!body) {
-    return null
-  }
+  // const body = error
+  //   ? error.root
+  //     ? String(error?.root?.message)
+  //     : String(error?.message)
+  //   : children
+
+  // if (!body) {
+  //   return null
+  // }
+
+  const messages: any[] = []
+
+  const errors = Array.isArray(error)
+    ? error
+    : [error];
+  
+  errors.forEach((err) => {
+    const body = err
+      ? err.root
+        ? String(err?.root?.message)
+        : String(err?.message)
+      : children
+
+    if (!body) {
+      return null
+    } else {
+      messages.push(body)
+    }    
+  });
 
   return (
-    <p
+    <div
       ref={ref}
       id={formMessageId}
       className={cn("text-sm font-medium text-destructive", className)}
       {...props}
     >
-      {body}
-    </p>
+      {messages.map((message, index) => (
+        <p key={`${formMessageId}-${index}`}>{message}</p>
+      ))}
+    </div>
   )
 })
 FormMessage.displayName = "FormMessage"
diff --git a/fields/core/autocomplete/edit-component.css b/fields/core/autocomplete/edit-component.css
index f74dc577..2261f005 100644
--- a/fields/core/autocomplete/edit-component.css
+++ b/fields/core/autocomplete/edit-component.css
@@ -53,6 +53,19 @@
 
 .react-select__menu {
   @apply !rounded-md !border !border-input !shadow-md !bg-popover !text-popover-foreground !max-h-96 !min-w-[8rem];
+  animation: selectMenuIn 150ms cubic-bezier(0.4, 0, 0.2, 1);
+  transform-origin: top;
+}
+
+@keyframes selectMenuIn {
+  0% {
+    opacity: 0;
+    transform: translateY(-0.5rem) scale(0.95);
+  }
+  100% {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
 }
 
 .react-select__menu-list {
diff --git a/fields/core/autocomplete/edit-component.tsx b/fields/core/autocomplete/edit-component.tsx
index 13551cbd..2b34e1dd 100644
--- a/fields/core/autocomplete/edit-component.tsx
+++ b/fields/core/autocomplete/edit-component.tsx
@@ -9,6 +9,30 @@ import AsyncCreatableSelect from "react-select/async-creatable";
 import { ChevronDown, X } from "lucide-react";
 import { safeAccess } from "@/lib/schema";
 
+const Option = ({ children, ...props }: any) => {
+  const { data } = props;
+  return (
+    <components.Option {...props}>
+      <div className="flex items-center gap-2">
+        {data.image && <img src={data.image} alt="" className="w-6 h-6 rounded-full" />}
+        {children}
+      </div>
+    </components.Option>
+  );
+};
+
+const SingleValue = ({ children, ...props }: any) => {
+  const { data } = props;
+  return (
+    <components.SingleValue {...props}>
+      <div className="flex items-center gap-2">
+        {data.image && <img src={data.image} alt="" className="w-6 h-6 rounded-full" />}
+        {children}
+      </div>
+    </components.SingleValue>
+  );
+};
+
 const processTemplate = (template: string, item: any): string => {
   return template.replace(/\{([^}]+)\}/g, (_, path) => {
     const value = safeAccess(item, path);
@@ -43,6 +67,7 @@ type FetchConfig = {
   value?: string;
   label?: string;
   minlength?: number;
+  image?: string;
 };
 
 const EditComponent = forwardRef((props: any, ref: any) => {
@@ -89,6 +114,9 @@ const EditComponent = forwardRef((props: any, ref: any) => {
           label: fetchConfig.label ?
             (fetchConfig.label.includes('{') ? processTemplate(fetchConfig.label, item) : safeAccess(item, fetchConfig.label))
             : item.name,
+          image: fetchConfig.image ? 
+            (fetchConfig.image.includes('{') ? processTemplate(fetchConfig.image, item) : safeAccess(item, fetchConfig.image))
+            : undefined,
         }));
       } catch (error) {
         console.error("Error loading options:", error);
@@ -109,13 +137,21 @@ const EditComponent = forwardRef((props: any, ref: any) => {
 
   const handleChange = useCallback(
     (newValue: any) => {
-      setSelectedOptions(newValue);
+      // When a new value is selected, ensure we display the value, not the label
+      const selectedValue = newValue 
+        ? field.options?.multiple 
+          ? newValue.map((item: any) => ({ value: item.value, label: item.value }))
+          : { value: newValue.value, label: newValue.value }
+        : field.options?.multiple ? [] : null;
+      
+      setSelectedOptions(selectedValue);
+
       const output = field.options?.multiple
         ? newValue ? newValue.map((item: any) => item.value) : []
         : newValue ? newValue.value : null;
       onChange(output);
     },
-    [onChange, field.options?.multiple]
+    [onChange, field.options?.multiple, field]
   );
 
   if (!isMounted) return null;
@@ -125,8 +161,8 @@ const EditComponent = forwardRef((props: any, ref: any) => {
       ? AsyncCreatableSelect
       : AsyncSelect
     : field.options?.creatable
-    ? CreatableSelect
-    : Select;
+      ? CreatableSelect
+      : Select;
 
   const fetchConfig = field.options?.fetch as FetchConfig;
   return (
@@ -135,7 +171,13 @@ const EditComponent = forwardRef((props: any, ref: any) => {
       isMulti={field.options?.multiple}
       classNamePrefix="react-select"
       placeholder={field.options?.placeholder || "Select..."}
-      components={{ DropdownIndicator, ClearIndicator, MultiValueRemove }}
+      components={{ 
+        DropdownIndicator, 
+        ClearIndicator, 
+        MultiValueRemove,
+        Option,
+        SingleValue,
+      }}
       value={selectedOptions}
       onChange={handleChange}
       {...(fetchConfig
diff --git a/fields/core/autocomplete/index.tsx b/fields/core/autocomplete/index.tsx
index 3280098c..763d0958 100644
--- a/fields/core/autocomplete/index.tsx
+++ b/fields/core/autocomplete/index.tsx
@@ -16,7 +16,7 @@ const schema = (field: Field) => {
     zodSchema = z.coerce.string();
   }
 
-  if (field.options?.multiple) zodSchema = z.array(zodSchema);
+  if (field.options?.multiple) zodSchema = z.array(zodSchema, { message: `Error` });
   
   if (!field.required) zodSchema = zodSchema.optional();
   

From 4ac54a7b277c9bd06b6adde424a22e33d7481e11 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 14 Mar 2025 09:35:23 +0800
Subject: [PATCH 24/95] Working proof of concept for caching and Reference
 field

---
 .../[branch]/collections/[name]/route.ts      |  77 +--
 app/api/webhook/github/route.ts               |  41 ++
 components/collection/collection-view.tsx     |   2 +-
 components/entry/entry-form.tsx               |   2 +-
 components/ui/form.tsx                        |  34 +-
 db/migrations/0001_brief_mesmero.sql          |  13 +
 db/migrations/meta/0001_snapshot.json         | 582 ++++++++++++++++++
 db/migrations/meta/_journal.json              |   7 +
 db/schema.ts                                  |  17 +-
 fields/core/autocomplete/edit-component.tsx   | 193 ------
 fields/core/old.select/edit-component.tsx     |  40 ++
 .../{autocomplete => old.select}/index.tsx    |  10 +-
 fields/core/reference/edit-component.tsx      |  39 ++
 fields/core/reference/index.tsx               |   3 +
 .../edit-component.css                        |   0
 fields/core/select/edit-component.tsx         | 229 ++++++-
 fields/core/select/index.tsx                  |  21 +-
 lib/githubCache.ts                            | 214 +++++++
 lib/schema.ts                                 |  11 +-
 19 files changed, 1239 insertions(+), 296 deletions(-)
 create mode 100644 db/migrations/0001_brief_mesmero.sql
 create mode 100644 db/migrations/meta/0001_snapshot.json
 delete mode 100644 fields/core/autocomplete/edit-component.tsx
 create mode 100644 fields/core/old.select/edit-component.tsx
 rename fields/core/{autocomplete => old.select}/index.tsx (63%)
 create mode 100644 fields/core/reference/edit-component.tsx
 create mode 100644 fields/core/reference/index.tsx
 rename fields/core/{autocomplete => select}/edit-component.css (100%)
 create mode 100644 lib/githubCache.ts

diff --git a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
index 8985b28b..e4831bbb 100644
--- a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
@@ -1,14 +1,14 @@
 export const maxDuration = 30;
 
 import { type NextRequest } from "next/server";
-import { createOctokitInstance } from "@/lib/utils/octokit"
 import { readFns } from "@/fields/registry";
 import { parse } from "@/lib/serialization";
-import { deepMap, getDateFromFilename, getSchemaByName } from "@/lib/schema";
+import { deepMap, getDateFromFilename, getSchemaByName, safeAccess } from "@/lib/schema";
 import { getConfig } from "@/lib/utils/config";
 import { normalizePath } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
+import { getCachedCollection } from "@/lib/githubCache";
 
 export async function GET(
   request: NextRequest,
@@ -29,39 +29,15 @@ export async function GET(
 
     const searchParams = request.nextUrl.searchParams;
     const path = searchParams.get("path") || "";
+    const type = searchParams.get("type");
+    const query = searchParams.get("query") || "";
+    const fields = searchParams.get("fields")?.split(",") || ["name"];
+
     const normalizedPath = normalizePath(path);
     if (!normalizedPath.startsWith(schema.path)) throw new Error(`Invalid path "${path}" for collection "${params.name}".`);
-    
-    const octokit = createOctokitInstance(token);
-    const query = `
-      query ($owner: String!, $repo: String!, $expression: String!) {
-        repository(owner: $owner, name: $repo) {
-          object(expression: $expression) {
-            ... on Tree {
-              entries {
-                name
-                path
-                type
-                object {
-                  ... on Blob {
-                    text
-                    oid
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    `;
-    const expression = `${params.branch}:${normalizedPath}`;
-    const response: any = await octokit.graphql(query, { owner: params.owner, repo: params.repo, expression });
-    // TODO: handle 401 / Bad credentials error
-
-    const entries = response.repository?.object?.entries;
-
-    if (entries === undefined) throw new Error("Not found");
 
+    let entries = await getCachedCollection(params.owner, params.repo, params.branch, normalizedPath, token);
+    
     let data: {
       contents: Record<string, any>[],
       errors: string[]
@@ -69,8 +45,35 @@ export async function GET(
       contents: [],
       errors: []
     };
+    
+    if (entries) {
+      data = parseContents(entries, schema, config);
 
-    if (entries) data  = parseContents(entries, schema, config);
+      console.log("data", JSON.stringify(data, null, 2));
+      
+      // If this is a search request, filter the contents
+      if (type === "search" && query) {
+        const searchQuery = query.toLowerCase();
+        data.contents = data.contents.filter(item => {
+          return fields.some(field => {
+            // Handle extra fields (name and path)
+            if (field === 'name' || field === 'path') {
+              const value = item[field];
+              return value && String(value).toLowerCase().includes(searchQuery);
+            }
+            
+            // Handle content fields (e.g. fields.title)
+            if (field.startsWith('fields.')) {
+              const fieldPath = field.replace('fields.', '');
+              const value = safeAccess(item.fields, fieldPath);
+              return value && String(value).toLowerCase().includes(searchQuery);
+            }
+            
+            return false;
+          });
+        });
+      }
+    }
 
     return Response.json({
       status: "success",
@@ -107,7 +110,7 @@ const parseContents = (
       if (serializedTypes.includes(schema.format) && schema.fields) {
         // If we are dealing with a serialized format and we have fields defined
         try {
-          contentObject = parse(item.object.text, { format: schema.format, delimiters: schema.delimiters });
+          contentObject = parse(item.content, { format: schema.format, delimiters: schema.delimiters });
           contentObject = deepMap(contentObject, schema.fields, (value, field) => readFns[field.type] ? readFns[field.type](value, field, config) : value);
         } catch (error: any) {
           // TODO: send this to the client?
@@ -132,11 +135,11 @@ const parseContents = (
       }
       // TODO: handle proper returns
       return {
-        sha: item.object.oid,
+        sha: item.sha,
         name: item.name,
         path: item.path,
-        content: item.object.text,
-        object: contentObject,
+        content: item.content,
+        fields: contentObject,
         type: "file",
       };
     } else if (item.type === "tree") {
diff --git a/app/api/webhook/github/route.ts b/app/api/webhook/github/route.ts
index 5a81d8ae..f14485c1 100644
--- a/app/api/webhook/github/route.ts
+++ b/app/api/webhook/github/route.ts
@@ -3,6 +3,9 @@ import crypto from "crypto";
 import { db } from "@/db";
 import { collaboratorTable, githubInstallationTokenTable } from "@/db/schema";
 import { eq, inArray } from "drizzle-orm";
+import { normalizePath } from "@/lib/utils/file";
+import { updateCache } from "@/lib/githubCache";
+import { getInstallationToken } from "@/lib/token";
 
 export async function POST(request: Request) {
   try {
@@ -62,6 +65,44 @@ export async function POST(request: Request) {
             );
           }
           break;
+        case "push":
+          const owner = data.repository.owner.login.toLowerCase();
+          const repo = data.repository.name.toLowerCase();
+          const branch = data.ref.replace('refs/heads/', '');
+          
+          const removedFiles = data.commits.flatMap((commit: any) => 
+            (commit.removed || []).map((path: string) => ({ 
+              path: normalizePath(path) 
+            }))
+          );
+          
+          const modifiedFiles = data.commits.flatMap((commit: any) => 
+            (commit.modified || []).map((path: string) => ({
+              path: normalizePath(path),
+              sha: commit.id
+            }))
+          );
+
+          const addedFiles = data.commits.flatMap((commit: any) => 
+            (commit.added || []).map((path: string) => ({
+              path: normalizePath(path),
+              sha: commit.id
+            }))
+          );
+
+          // TODO: verify this is secure
+          const installationToken = await getInstallationToken(owner, repo);
+
+          await updateCache(
+            owner,
+            repo,
+            branch,
+            removedFiles,
+            modifiedFiles,
+            addedFiles,
+            installationToken
+          );
+          break;
       }
     } catch (error: any) {
       // TODO: this may need to be logged for remediation since the DB must be accurate
diff --git a/components/collection/collection-view.tsx b/components/collection/collection-view.tsx
index edb9e25f..19e872ee 100644
--- a/components/collection/collection-view.tsx
+++ b/components/collection/collection-view.tsx
@@ -138,7 +138,7 @@ export function CollectionView({
       
       return {
         accessorKey: path,
-        accessorFn: (originalRow: any) => safeAccess(originalRow.object, path),
+        accessorFn: (originalRow: any) => safeAccess(originalRow.fields, path),
         header: field?.label ?? field.name,
         meta: { className: field.name === primaryField ? "truncate w-full min-w-[12rem] max-w-[1px]" : "" },
         cell: ({ cell, row }: { cell: any, row: any }) => {
diff --git a/components/entry/entry-form.tsx b/components/entry/entry-form.tsx
index 9460c85e..ddd6b209 100644
--- a/components/entry/entry-form.tsx
+++ b/components/entry/entry-form.tsx
@@ -141,6 +141,7 @@ const ListField = ({
     }
   };
   
+  // We don't render <FormMessage/> in ListField, because it's already rendered in the individual fields
   return (
     <FormField
       name={fieldName}
@@ -198,7 +199,6 @@ const ListField = ({
                 </Button>
             }
           </div>
-          <FormMessage/>
         </FormItem>
       )}
     />
diff --git a/components/ui/form.tsx b/components/ui/form.tsx
index 3e10fd8e..f25c4f47 100644
--- a/components/ui/form.tsx
+++ b/components/ui/form.tsx
@@ -145,16 +145,6 @@ const FormMessage = React.forwardRef<
   React.HTMLAttributes<HTMLParagraphElement>
 >(({ className, children, ...props }, ref) => {
   const { error, formMessageId } = useFormField()
-  
-  // const body = error
-  //   ? error.root
-  //     ? String(error?.root?.message)
-  //     : String(error?.message)
-  //   : children
-
-  // if (!body) {
-  //   return null
-  // }
 
   const messages: any[] = []
 
@@ -177,16 +167,20 @@ const FormMessage = React.forwardRef<
   });
 
   return (
-    <div
-      ref={ref}
-      id={formMessageId}
-      className={cn("text-sm font-medium text-destructive", className)}
-      {...props}
-    >
-      {messages.map((message, index) => (
-        <p key={`${formMessageId}-${index}`}>{message}</p>
-      ))}
-    </div>
+    messages.length > 0
+      ? (
+        <div
+          ref={ref}
+          id={formMessageId}
+          className={cn("text-sm font-medium text-destructive", className)}
+          {...props}
+        >
+          {messages.map((message, index) => (
+            <p key={`${formMessageId}-${index}`}>{message}</p>
+          ))}
+        </div>
+      )
+      : null
   )
 })
 FormMessage.displayName = "FormMessage"
diff --git a/db/migrations/0001_brief_mesmero.sql b/db/migrations/0001_brief_mesmero.sql
new file mode 100644
index 00000000..d9ca79f3
--- /dev/null
+++ b/db/migrations/0001_brief_mesmero.sql
@@ -0,0 +1,13 @@
+CREATE TABLE `cached_entries` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`owner` text NOT NULL,
+	`repo` text NOT NULL,
+	`branch` text NOT NULL,
+	`parent_path` text NOT NULL,
+	`name` text NOT NULL,
+	`path` text NOT NULL,
+	`type` text NOT NULL,
+	`content` text,
+	`sha` text,
+	`last_updated` integer NOT NULL
+);
diff --git a/db/migrations/meta/0001_snapshot.json b/db/migrations/meta/0001_snapshot.json
new file mode 100644
index 00000000..bea7effd
--- /dev/null
+++ b/db/migrations/meta/0001_snapshot.json
@@ -0,0 +1,582 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "86214e27-a7c3-4087-8050-6fc55560872a",
+  "prevId": "9bebad23-d902-47ff-b6e6-8878fb0c5b3e",
+  "tables": {
+    "cached_entries": {
+      "name": "cached_entries",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "parent_path": {
+          "name": "parent_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sha": {
+          "name": "sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_updated": {
+          "name": "last_updated",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "collaborator": {
+      "name": "collaborator",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "installation_id": {
+          "name": "installation_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner_id": {
+          "name": "owner_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo_id": {
+          "name": "repo_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "collaborator_user_id_user_id_fk": {
+          "name": "collaborator_user_id_user_id_fk",
+          "tableFrom": "collaborator",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "collaborator_invited_by_user_id_fk": {
+          "name": "collaborator_invited_by_user_id_fk",
+          "tableFrom": "collaborator",
+          "tableTo": "user",
+          "columnsFrom": [
+            "invited_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "config": {
+      "name": "config",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sha": {
+          "name": "sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "object": {
+          "name": "object",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "email_login_token": {
+      "name": "email_login_token",
+      "columns": {
+        "token_hash": {
+          "name": "token_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "email_login_token_token_hash_unique": {
+          "name": "email_login_token_token_hash_unique",
+          "columns": [
+            "token_hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "github_installation_token": {
+      "name": "github_installation_token",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "ciphertext": {
+          "name": "ciphertext",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iv": {
+          "name": "iv",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "installation_id": {
+          "name": "installation_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "github_user_token": {
+      "name": "github_user_token",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "ciphertext": {
+          "name": "ciphertext",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iv": {
+          "name": "iv",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "github_user_token_user_id_user_id_fk": {
+          "name": "github_user_token_user_id_user_id_fk",
+          "tableFrom": "github_user_token",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "history": {
+      "name": "history",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_visited": {
+          "name": "last_visited",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "history_user_id_user_id_fk": {
+          "name": "history_user_id_user_id_fk",
+          "tableFrom": "history",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "session": {
+      "name": "session",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_email": {
+          "name": "github_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_name": {
+          "name": "github_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_id": {
+          "name": "github_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_username": {
+          "name": "github_username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "user_github_id_unique": {
+          "name": "user_github_id_unique",
+          "columns": [
+            "github_id"
+          ],
+          "isUnique": true
+        },
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/db/migrations/meta/_journal.json b/db/migrations/meta/_journal.json
index e63938b2..d0d5c7b5 100644
--- a/db/migrations/meta/_journal.json
+++ b/db/migrations/meta/_journal.json
@@ -8,6 +8,13 @@
       "when": 1733392958887,
       "tag": "0000_lame_dormammu",
       "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1741784806486,
+      "tag": "0001_brief_mesmero",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/db/schema.ts b/db/schema.ts
index fd793f8b..6b8ed374 100644
--- a/db/schema.ts
+++ b/db/schema.ts
@@ -74,6 +74,20 @@ const configTable = sqliteTable("config", {
   object: text("object").notNull()
 });
 
+const cachedEntriesTable = sqliteTable("cached_entries", {
+  id: integer("id").primaryKey({ autoIncrement: true }),
+  owner: text("owner").notNull(),
+  repo: text("repo").notNull(),
+  branch: text("branch").notNull(),
+  parentPath: text("parent_path").notNull(),
+  name: text("name").notNull(),
+  path: text("path").notNull(),
+  type: text("type").notNull(),
+  content: text("content"),
+  sha: text("sha"),
+  lastUpdated: integer("last_updated").notNull()
+});
+
 export {
   userTable,
   sessionTable,
@@ -82,5 +96,6 @@ export {
   githubInstallationTokenTable,
   emailLoginTokenTable,
   collaboratorTable,
-  configTable
+  configTable,
+  cachedEntriesTable
 };
\ No newline at end of file
diff --git a/fields/core/autocomplete/edit-component.tsx b/fields/core/autocomplete/edit-component.tsx
deleted file mode 100644
index 2b34e1dd..00000000
--- a/fields/core/autocomplete/edit-component.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-"use client";
-
-import { forwardRef, useMemo, useState, useCallback, useEffect } from "react";
-import "./edit-component.css";
-import Select, { components } from "react-select";
-import CreatableSelect from "react-select/creatable";
-import AsyncSelect from "react-select/async";
-import AsyncCreatableSelect from "react-select/async-creatable";
-import { ChevronDown, X } from "lucide-react";
-import { safeAccess } from "@/lib/schema";
-
-const Option = ({ children, ...props }: any) => {
-  const { data } = props;
-  return (
-    <components.Option {...props}>
-      <div className="flex items-center gap-2">
-        {data.image && <img src={data.image} alt="" className="w-6 h-6 rounded-full" />}
-        {children}
-      </div>
-    </components.Option>
-  );
-};
-
-const SingleValue = ({ children, ...props }: any) => {
-  const { data } = props;
-  return (
-    <components.SingleValue {...props}>
-      <div className="flex items-center gap-2">
-        {data.image && <img src={data.image} alt="" className="w-6 h-6 rounded-full" />}
-        {children}
-      </div>
-    </components.SingleValue>
-  );
-};
-
-const processTemplate = (template: string, item: any): string => {
-  return template.replace(/\{([^}]+)\}/g, (_, path) => {
-    const value = safeAccess(item, path);
-    return value !== undefined ? String(value) : '';
-  });
-};
-
-const DropdownIndicator = (props: any) => (
-  <components.DropdownIndicator {...props}>
-    <ChevronDown className="w-4 h-4" />
-  </components.DropdownIndicator>
-);
-
-const ClearIndicator = (props: any) => (
-  <components.ClearIndicator {...props}>
-    <X className="w-4 h-4" />
-  </components.ClearIndicator>
-);
-
-const MultiValueRemove = (props: any) => (
-  <components.MultiValueRemove {...props}>
-    <X className="w-3 h-3 stroke-[2.5]" />
-  </components.MultiValueRemove>
-);
-
-type FetchConfig = {
-  url: string;
-  method?: string;
-  query?: string;
-  headers?: Record<string, string>;
-  results?: string;
-  value?: string;
-  label?: string;
-  minlength?: number;
-  image?: string;
-};
-
-const EditComponent = forwardRef((props: any, ref: any) => {
-  const { value, field, onChange } = props;
-  const [isMounted, setIsMounted] = useState(false);
-
-  useEffect(() => setIsMounted(true), []);
-
-  const staticOptions = useMemo(
-    () =>
-      !field.options?.fetch && field.options?.values
-        ? field.options.values.map((opt: any) =>
-            typeof opt === "object"
-              ? { value: opt.value, label: opt.label }
-              : { value: opt, label: opt }
-          )
-        : [],
-    [field.options?.values, field.options?.fetch]
-  );
-
-  const loadOptions = useCallback(
-    async (input: string) => {
-      const fetchConfig = field.options?.fetch as FetchConfig;
-      const minLength = fetchConfig?.minlength || 0;
-      if (!fetchConfig?.url || input.length < minLength) {
-        return [];
-      }
-
-      try {
-        const url = new URL(fetchConfig.url);
-        if (fetchConfig.query) url.searchParams.append(fetchConfig.query, input);
-        const response = await fetch(url, {
-          method: fetchConfig.method || "GET",
-          headers: fetchConfig.headers || {},
-        });
-        if (!response.ok) throw new Error("Fetch failed");
-        const data = await response.json();
-        const results = fetchConfig.results ? safeAccess(data, fetchConfig.results) : data;
-        if (!Array.isArray(results)) return [];
-        return results.map((item: any) => ({
-          value: fetchConfig.value ? 
-            (fetchConfig.value.includes('{') ? processTemplate(fetchConfig.value, item) : safeAccess(item, fetchConfig.value))
-            : item.id,
-          label: fetchConfig.label ?
-            (fetchConfig.label.includes('{') ? processTemplate(fetchConfig.label, item) : safeAccess(item, fetchConfig.label))
-            : item.name,
-          image: fetchConfig.image ? 
-            (fetchConfig.image.includes('{') ? processTemplate(fetchConfig.image, item) : safeAccess(item, fetchConfig.image))
-            : undefined,
-        }));
-      } catch (error) {
-        console.error("Error loading options:", error);
-        return [];
-      }
-    },
-    [field.options?.fetch]
-  );
-
-  const [selectedOptions, setSelectedOptions] = useState(() => {
-    if (field.options?.multiple) {
-      const values = Array.isArray(value) ? value : [];
-      return values.map((val: any) => ({ value: val, label: val }));
-    }
-    if (!value) return null;
-    return { value: value, label: value };
-  });
-
-  const handleChange = useCallback(
-    (newValue: any) => {
-      // When a new value is selected, ensure we display the value, not the label
-      const selectedValue = newValue 
-        ? field.options?.multiple 
-          ? newValue.map((item: any) => ({ value: item.value, label: item.value }))
-          : { value: newValue.value, label: newValue.value }
-        : field.options?.multiple ? [] : null;
-      
-      setSelectedOptions(selectedValue);
-
-      const output = field.options?.multiple
-        ? newValue ? newValue.map((item: any) => item.value) : []
-        : newValue ? newValue.value : null;
-      onChange(output);
-    },
-    [onChange, field.options?.multiple, field]
-  );
-
-  if (!isMounted) return null;
-
-  const SelectComponent = field.options?.fetch
-    ? field.options?.creatable
-      ? AsyncCreatableSelect
-      : AsyncSelect
-    : field.options?.creatable
-      ? CreatableSelect
-      : Select;
-
-  const fetchConfig = field.options?.fetch as FetchConfig;
-  return (
-    <SelectComponent
-      ref={ref}
-      isMulti={field.options?.multiple}
-      classNamePrefix="react-select"
-      placeholder={field.options?.placeholder || "Select..."}
-      components={{ 
-        DropdownIndicator, 
-        ClearIndicator, 
-        MultiValueRemove,
-        Option,
-        SingleValue,
-      }}
-      value={selectedOptions}
-      onChange={handleChange}
-      {...(fetchConfig
-        ? {
-            loadOptions,
-            cacheOptions: false,
-          }
-        : { options: staticOptions })}
-    />
-  );
-});
-
-export { EditComponent };
\ No newline at end of file
diff --git a/fields/core/old.select/edit-component.tsx b/fields/core/old.select/edit-component.tsx
new file mode 100644
index 00000000..1efe345a
--- /dev/null
+++ b/fields/core/old.select/edit-component.tsx
@@ -0,0 +1,40 @@
+"use client";
+
+import { forwardRef } from "react";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select"
+
+const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLTextAreaElement>) => {
+  const { value, field, onChange } = props;
+
+  return (
+    <Select onValueChange={onChange} value={value}>
+      <SelectTrigger>
+        <SelectValue />
+      </SelectTrigger>
+      <SelectContent>
+        {field.options?.values.map((option: any) => {
+          let value;
+          let label;
+          if (typeof option === "object") {
+            value = option.value;
+            label = option.label;
+          } else {
+            value = option;
+            label = option;
+          }
+          return (
+            <SelectItem key={value} value={value}>{label}</SelectItem>
+          );
+        })}
+      </SelectContent>
+    </Select>
+  )
+});
+
+export { EditComponent };
\ No newline at end of file
diff --git a/fields/core/autocomplete/index.tsx b/fields/core/old.select/index.tsx
similarity index 63%
rename from fields/core/autocomplete/index.tsx
rename to fields/core/old.select/index.tsx
index 763d0958..cd3eed58 100644
--- a/fields/core/autocomplete/index.tsx
+++ b/fields/core/old.select/index.tsx
@@ -4,8 +4,8 @@ import { EditComponent } from "./edit-component";
 
 const schema = (field: Field) => {
   let zodSchema;
-  
-  if (!field.options?.creatable && !field.options?.fetch && field.options?.values && Array.isArray(field.options.values)) {
+
+  if (field.options?.values && Array.isArray(field.options.values)) {
     const normalizedValues = field.options.values.map((item) => {
       return typeof item === "object"
         ? item.value
@@ -13,14 +13,12 @@ const schema = (field: Field) => {
     });
     zodSchema = z.enum(normalizedValues as [string, ...string[]]);
   } else {
-    zodSchema = z.coerce.string();
+    zodSchema = z.string();
   }
 
-  if (field.options?.multiple) zodSchema = z.array(zodSchema, { message: `Error` });
-  
   if (!field.required) zodSchema = zodSchema.optional();
   
   return zodSchema;
 };
 
-export { schema, EditComponent };
\ No newline at end of file
+export { schema, EditComponent};
\ No newline at end of file
diff --git a/fields/core/reference/edit-component.tsx b/fields/core/reference/edit-component.tsx
new file mode 100644
index 00000000..47315841
--- /dev/null
+++ b/fields/core/reference/edit-component.tsx
@@ -0,0 +1,39 @@
+"use client";
+
+import { EditComponent as SelectEditComponent } from "../select";
+import { forwardRef, useMemo } from "react";
+import { getSchemaByName } from "@/lib/schema";
+import { useConfig } from "@/contexts/config-context";
+
+// const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLTextAreaElement>) => {
+//   return <SelectEditComponent {...props} ref={ref} className="text-base" />;
+// });
+
+const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>) => {
+  const { value, field, onChange } = props;
+
+  const { config } = useConfig();
+  if (!config) return null;
+
+  const collection = getSchemaByName(config.object, field.options.collection);
+  if (!collection) return null;
+
+  const fetchConfig = useMemo(() => ({
+    url: `/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collections/${field.options.collection}`,
+    params: {
+      path: collection.path,
+      type: "search",
+      query: "{input}",
+      fields: field.options.search || "name"
+    },
+    minlength: 2,
+    results: "data.contents",
+    value: field.options.value || "{path}",
+    label: field.options.label || "{name}",
+    headers: {},
+  }), [config.owner, config.repo, config.branch, field.options]);
+
+  return <SelectEditComponent {...props} field={{ ...field, options: { ...field.options, fetch: fetchConfig }}} ref={ref} />;
+});
+
+export { EditComponent };
\ No newline at end of file
diff --git a/fields/core/reference/index.tsx b/fields/core/reference/index.tsx
new file mode 100644
index 00000000..3dd612f7
--- /dev/null
+++ b/fields/core/reference/index.tsx
@@ -0,0 +1,3 @@
+import { EditComponent } from "./edit-component";
+
+export { EditComponent };
\ No newline at end of file
diff --git a/fields/core/autocomplete/edit-component.css b/fields/core/select/edit-component.css
similarity index 100%
rename from fields/core/autocomplete/edit-component.css
rename to fields/core/select/edit-component.css
diff --git a/fields/core/select/edit-component.tsx b/fields/core/select/edit-component.tsx
index 1efe345a..64966846 100644
--- a/fields/core/select/edit-component.tsx
+++ b/fields/core/select/edit-component.tsx
@@ -1,40 +1,207 @@
 "use client";
 
-import { forwardRef } from "react";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select"
-
-const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLTextAreaElement>) => {
+import { forwardRef, useMemo, useState, useCallback, useEffect } from "react";
+import "./edit-component.css";
+import Select, { components } from "react-select";
+import CreatableSelect from "react-select/creatable";
+import AsyncSelect from "react-select/async";
+import AsyncCreatableSelect from "react-select/async-creatable";
+import { ChevronDown, X } from "lucide-react";
+import { safeAccess, interpolate } from "@/lib/schema";
+
+const Option = ({ children, ...props }: any) => {
+  const { data } = props;
+  return (
+    <components.Option {...props}>
+      <div className="flex items-center gap-2">
+        {data.image && <img src={data.image} alt="" className="w-6 h-6 rounded-full" />}
+        {children}
+      </div>
+    </components.Option>
+  );
+};
+
+const SingleValue = ({ children, ...props }: any) => {
+  const { data } = props;
+  return (
+    <components.SingleValue {...props}>
+      <div className="flex items-center gap-2">
+        {data.image && <img src={data.image} alt="" className="w-6 h-6 rounded-full" />}
+        {children}
+      </div>
+    </components.SingleValue>
+  );
+};
+
+const DropdownIndicator = (props: any) => (
+  <components.DropdownIndicator {...props}>
+    <ChevronDown className="w-4 h-4" />
+  </components.DropdownIndicator>
+);
+
+const ClearIndicator = (props: any) => (
+  <components.ClearIndicator {...props}>
+    <X className="w-4 h-4" />
+  </components.ClearIndicator>
+);
+
+const MultiValueRemove = (props: any) => (
+  <components.MultiValueRemove {...props}>
+    <X className="w-3 h-3 stroke-[2.5]" />
+  </components.MultiValueRemove>
+);
+
+type ParamValue = string | { value: 'input' } | { template: string };
+
+type FetchConfig = {
+  url: string;
+  method?: string;
+  params?: Record<string, string>;
+  headers?: Record<string, string>;
+  results?: string;
+  value?: string;
+  label?: string;
+  minlength?: number;
+  image?: string;
+};
+
+const EditComponent = forwardRef((props: any, ref: any) => {
   const { value, field, onChange } = props;
+  console.log('select field', field);
+  const [isMounted, setIsMounted] = useState(false);
+
+  useEffect(() => setIsMounted(true), []);
+
+  const staticOptions = useMemo(
+    () =>
+      !field.options?.fetch && field.options?.values
+        ? field.options.values.map((opt: any) =>
+            typeof opt === "object"
+              ? { value: opt.value, label: opt.label }
+              : { value: opt, label: opt }
+          )
+        : [],
+    [field.options?.values, field.options?.fetch]
+  );
+
+  const loadOptions = useCallback(
+    async (input: string) => {
+      const fetchConfig = field.options?.fetch as FetchConfig;
+      const minLength = fetchConfig?.minlength || 0;
+      if (!fetchConfig?.url || input.length < minLength) {
+        return [];
+      }
+
+      try {
+        const searchParams = new URLSearchParams();
+        
+        // Handle params
+        if (fetchConfig.params) {
+          Object.entries(fetchConfig.params).forEach(([key, paramValue]) => {
+            if (Array.isArray(paramValue)) {
+              paramValue.forEach(value => {
+                const interpolatedValue = interpolate(value, { input });
+                searchParams.append(key, interpolatedValue);
+              });
+            } else {
+              const value = interpolate(paramValue, { input });
+              searchParams.append(key, value);
+            }
+          });
+        }
+
+        const queryString = searchParams.toString();
+        const url = `${fetchConfig.url}${queryString ? `?${queryString}` : ''}`;
+        
+        const response = await fetch(url, {
+          method: fetchConfig.method || "GET",
+          headers: fetchConfig.headers || {},
+        });
+        if (!response.ok) throw new Error("Fetch failed");
+        const data = await response.json();
+        const results = fetchConfig.results ? safeAccess(data, fetchConfig.results) : data;
+        if (!Array.isArray(results)) return [];
+        return results.map((item: any) => ({
+          value: fetchConfig.value ? 
+            interpolate(fetchConfig.value, item)
+            : item.id,
+          label: fetchConfig.label ?
+            interpolate(fetchConfig.label, item)
+            : item.name,
+          image: fetchConfig.image ? 
+            interpolate(fetchConfig.image, item)
+            : undefined,
+        }));
+      } catch (error) {
+        console.error("Error loading options:", error);
+        return [];
+      }
+    },
+    [field.options?.fetch]
+  );
+
+  const [selectedOptions, setSelectedOptions] = useState(() => {
+    if (field.options?.multiple) {
+      const values = Array.isArray(value) ? value : [];
+      return values.map((val: any) => ({ value: val, label: val }));
+    }
+    if (!value) return null;
+    return { value: value, label: value };
+  });
+
+  const handleChange = useCallback(
+    (newValue: any) => {
+      // When a new value is selected, ensure we display the value, not the label
+      const selectedValue = newValue 
+        ? field.options?.multiple 
+          ? newValue.map((item: any) => ({ value: item.value, label: item.value }))
+          : { value: newValue.value, label: newValue.value }
+        : field.options?.multiple ? [] : null;
+      
+      setSelectedOptions(selectedValue);
+
+      const output = field.options?.multiple
+        ? newValue ? newValue.map((item: any) => item.value) : []
+        : newValue ? newValue.value : null;
+      onChange(output);
+    },
+    [onChange, field.options?.multiple, field]
+  );
+
+  if (!isMounted) return null;
+
+  const SelectComponent = field.options?.fetch
+    ? field.options?.creatable
+      ? AsyncCreatableSelect
+      : AsyncSelect
+    : field.options?.creatable
+      ? CreatableSelect
+      : Select;
 
+  const fetchConfig = field.options?.fetch as FetchConfig;
   return (
-    <Select onValueChange={onChange} value={value}>
-      <SelectTrigger>
-        <SelectValue />
-      </SelectTrigger>
-      <SelectContent>
-        {field.options?.values.map((option: any) => {
-          let value;
-          let label;
-          if (typeof option === "object") {
-            value = option.value;
-            label = option.label;
-          } else {
-            value = option;
-            label = option;
+    <SelectComponent
+      ref={ref}
+      isMulti={field.options?.multiple}
+      classNamePrefix="react-select"
+      placeholder={field.options?.placeholder || "Select..."}
+      components={{ 
+        DropdownIndicator, 
+        ClearIndicator, 
+        MultiValueRemove,
+        Option,
+        SingleValue,
+      }}
+      value={selectedOptions}
+      onChange={handleChange}
+      {...(fetchConfig
+        ? {
+            loadOptions,
+            cacheOptions: false,
           }
-          return (
-            <SelectItem key={value} value={value}>{label}</SelectItem>
-          );
-        })}
-      </SelectContent>
-    </Select>
-  )
+        : { options: staticOptions })}
+    />
+  );
 });
 
 export { EditComponent };
\ No newline at end of file
diff --git a/fields/core/select/index.tsx b/fields/core/select/index.tsx
index cd3eed58..2290dcc5 100644
--- a/fields/core/select/index.tsx
+++ b/fields/core/select/index.tsx
@@ -4,21 +4,32 @@ import { EditComponent } from "./edit-component";
 
 const schema = (field: Field) => {
   let zodSchema;
-
-  if (field.options?.values && Array.isArray(field.options.values)) {
+  
+  if (!field.options?.creatable && !field.options?.fetch && field.options?.values && Array.isArray(field.options.values)) {
     const normalizedValues = field.options.values.map((item) => {
       return typeof item === "object"
         ? item.value
         : item;
     });
-    zodSchema = z.enum(normalizedValues as [string, ...string[]]);
+    zodSchema = z.enum(normalizedValues as [string, ...string[]]).optional();
   } else {
-    zodSchema = z.string();
+    zodSchema = z.coerce.string();
   }
 
+  if (field.options?.multiple) {
+    zodSchema = z.preprocess(
+      (val) => {
+        if (val === "" || val === null) return undefined;
+        return val;
+      },
+      z.array(zodSchema)
+    );
+  }
+  
+  // TODO: optional array
   if (!field.required) zodSchema = zodSchema.optional();
   
   return zodSchema;
 };
 
-export { schema, EditComponent};
\ No newline at end of file
+export { schema, EditComponent };
\ No newline at end of file
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
new file mode 100644
index 00000000..e3197e73
--- /dev/null
+++ b/lib/githubCache.ts
@@ -0,0 +1,214 @@
+import { db } from "@/db";
+import { eq, and, inArray } from "drizzle-orm";
+import { cachedEntriesTable } from "@/db/schema";
+import { createOctokitInstance } from "@/lib/utils/octokit";
+import path from "path";
+
+type FileChange = {
+  path: string;
+  sha: string;
+};
+
+const updateCache = async (
+  owner: string,
+  repo: string,
+  branch: string,
+  removedFiles: Array<{ path: string }>,
+  modifiedFiles: Array<FileChange>,
+  addedFiles: Array<FileChange>,
+  token: string
+) => {
+  // Get all unique parent paths for all operations
+  const parentPaths = Array.from(new Set([
+    ...removedFiles.map(f => path.dirname(f.path)),
+    ...modifiedFiles.map(f => path.dirname(f.path)),
+    ...addedFiles.map(f => path.dirname(f.path))
+  ]));
+  
+  const entries = await db.query.cachedEntriesTable.findMany({
+    where: and(
+      eq(cachedEntriesTable.owner, owner),
+      eq(cachedEntriesTable.repo, repo),
+      eq(cachedEntriesTable.branch, branch),
+      inArray(cachedEntriesTable.parentPath, parentPaths)
+    )
+  });
+
+  const cachedParentPaths = parentPaths.length > 0 ? 
+    Array.from(new Set(entries.map(e => e.parentPath))) : [];
+
+  // Only process files in cached directories
+  const filesToRemove = removedFiles.filter(file => 
+    cachedParentPaths.includes(path.dirname(file.path))
+  );
+
+  const filesToFetch = [
+    ...modifiedFiles.filter(file => cachedParentPaths.includes(path.dirname(file.path))),
+    ...addedFiles.filter(file => cachedParentPaths.includes(path.dirname(file.path)))
+  ];
+
+  // Delete removed files (only if in cached directories)
+  if (filesToRemove.length > 0) {
+    await db.delete(cachedEntriesTable).where(
+      and(
+        eq(cachedEntriesTable.owner, owner),
+        eq(cachedEntriesTable.repo, repo),
+        eq(cachedEntriesTable.branch, branch),
+        inArray(cachedEntriesTable.path, filesToRemove.map(f => f.path))
+      )
+    );
+  }
+
+  if (filesToFetch.length === 0) return;
+
+  // Fetch content for all files in a single GraphQL query
+  const octokit = createOctokitInstance(token);
+  
+  const query = `
+    query($owner: String!, $repo: String!, ${filesToFetch.map((_, i) => `$exp${i}: String!`).join(', ')}) {
+      repository(owner: $owner, name: $repo) {
+        ${filesToFetch.map((_, i) => `
+          file${i}: object(expression: $exp${i}) {
+            ... on Blob {
+              text
+              oid
+            }
+          }
+        `).join('\n')}
+      }
+    }
+  `;
+
+  const variables = {
+    owner,
+    repo,
+    ...Object.fromEntries(
+      filesToFetch.map((file, i) => [`exp${i}`, `${branch}:${file.path}`])
+    )
+  };
+
+  const response: any = await octokit.graphql(query, variables);
+
+  // Process the results
+  const updates = filesToFetch.map((file, index) => {
+    const fileData = response.repository[`file${index}`];
+    return {
+      path: file.path,
+      parentPath: path.dirname(file.path),
+      content: fileData.text,
+      sha: fileData.oid,
+      lastUpdated: Date.now()
+    };
+  });
+
+  // Batch update the cache
+  for (const update of updates) {
+    const isModified = modifiedFiles.some(f => f.path === update.path);
+    
+    if (isModified) {
+      // Update existing entry
+      await db.update(cachedEntriesTable)
+        .set({
+          content: update.content,
+          sha: update.sha,
+          lastUpdated: update.lastUpdated
+        })
+        .where(
+          and(
+            eq(cachedEntriesTable.owner, owner),
+            eq(cachedEntriesTable.repo, repo),
+            eq(cachedEntriesTable.branch, branch),
+            eq(cachedEntriesTable.path, update.path)
+          )
+        );
+    } else {
+      // Insert new entry
+      await db.insert(cachedEntriesTable)
+        .values({
+          owner,
+          repo,
+          branch,
+          path: update.path,
+          parentPath: update.parentPath,
+          name: path.basename(update.path),
+          type: 'blob',
+          content: update.content,
+          sha: update.sha,
+          lastUpdated: update.lastUpdated
+        });
+    }
+  }
+}
+
+const getCachedCollection = async (
+  owner: string,
+  repo: string,
+  branch: string,
+  path: string,
+  token: string
+) => {
+  let entries = await db.query.cachedEntriesTable.findMany({
+    where: and(
+      eq(cachedEntriesTable.owner, owner),
+      eq(cachedEntriesTable.repo, repo),
+      eq(cachedEntriesTable.branch, branch),
+      eq(cachedEntriesTable.parentPath, path)
+    )
+  });
+
+  if (entries.length === 0) {
+    // No cache hit, fetch from GitHub
+    const octokit = createOctokitInstance(token);
+    const query = `
+      query ($owner: String!, $repo: String!, $expression: String!) {
+        repository(owner: $owner, name: $repo) {
+          object(expression: $expression) {
+            ... on Tree {
+              entries {
+                name
+                path
+                type
+                object {
+                  ... on Blob {
+                    text
+                    oid
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    `;
+    const expression = `${branch}:${path}`;
+    const response: any = await octokit.graphql(query, {
+      owner: owner,
+      repo: repo,
+      expression
+    });
+    // TODO: handle 401 / Bad credentials error
+
+    let githubEntries = response.repository?.object?.entries || [];
+
+    if (githubEntries.length > 0) {
+      entries = await db.insert(cachedEntriesTable)
+        .values(githubEntries.map((entry: any) => ({
+          owner: owner,
+          repo: repo,
+          branch: branch,
+          parentPath: path,
+          name: entry.name,
+          path: entry.path,
+          type: entry.type,
+          content: entry.type === "blob" ? entry.object.text : null,
+          sha: entry.type === "blob" ? entry.object.oid : null,
+          lastUpdated: Date.now()
+        })))
+        .returning();
+    }
+  }
+
+  return entries;
+}
+
+export { updateCache, getCachedCollection };
\ No newline at end of file
diff --git a/lib/schema.ts b/lib/schema.ts
index 1cee4caa..c5bd0478 100644
--- a/lib/schema.ts
+++ b/lib/schema.ts
@@ -240,6 +240,14 @@ function safeAccess(obj: Record<string, any>, path: string) {
   }, obj);
 }
 
+// Interpolate a string with a data object (e.g. {field.name} -> data.field.name)
+function interpolate(input: string, data: Record<string, any>): string {
+  return input.replace(/(?<!\\)\{([^}]+)\}/g, (_, token) => {
+    const value = safeAccess(data, token);
+    return value !== undefined ? String(value) : '';
+  }).replace(/\\([{}])/g, '$1');
+}
+
 // Get a field by its path
 function getFieldByPath(schema: Field[], path: string): Field | undefined {
   const [first, ...rest] = path.split('.');
@@ -315,5 +323,6 @@ export {
   nestFieldArrays,
   unnestFieldArrays,
   generateZodSchema,
-  safeAccess
+  safeAccess,
+  interpolate
 };
\ No newline at end of file

From da1676bb1e39635e7ee0cca40e18ceb176697863 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 14 Mar 2025 11:10:10 +0800
Subject: [PATCH 25/95] Adding comments on API endpoints

---
 app/api/[owner]/[repo]/[branch]/branches/route.ts   |  9 ++++++++-
 .../[repo]/[branch]/collections/[name]/route.ts     |  9 +++++++++
 .../[repo]/[branch]/entries/[path]/history/route.ts |  7 +++++++
 .../[owner]/[repo]/[branch]/entries/[path]/route.ts |  9 +++++++++
 .../[repo]/[branch]/files/[path]/rename/route.ts    |  7 +++++++
 .../[owner]/[repo]/[branch]/files/[path]/route.ts   |  8 ++++++++
 fields/core/reference/edit-component.tsx            |  7 ++++---
 fields/core/select/edit-component.tsx               | 10 +++++-----
 lib/schema.ts                                       | 13 ++++++++++---
 9 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/app/api/[owner]/[repo]/[branch]/branches/route.ts b/app/api/[owner]/[repo]/[branch]/branches/route.ts
index 58ccebfa..fe9e2a46 100644
--- a/app/api/[owner]/[repo]/[branch]/branches/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/branches/route.ts
@@ -2,6 +2,13 @@ import { createOctokitInstance } from "@/lib/utils/octokit";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
 
+/**
+ * Creates a new branch in a GitHub repository.
+ * POST /api/[owner]/[repo]/[branch]/branches
+ * 
+ * Requires authentication.
+ */
+
 export async function POST(
   request: Request,
   { params }: { params: { owner: string, repo: string, branch: string } }
@@ -18,7 +25,7 @@ export async function POST(
 
     const octokit = createOctokitInstance(token);
 
-    // Get the SHA of the branch we"re creating the new branch from
+    // Get the SHA of the branch we're creating the new branch from
     const { data: refData } = await octokit.rest.git.getRef({
       owner: params.owner,
       repo: params.repo,
diff --git a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
index e4831bbb..d2dbc7a1 100644
--- a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
@@ -10,6 +10,15 @@ import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
 import { getCachedCollection } from "@/lib/githubCache";
 
+/**
+ * Fetches and parses collection contents from GitHub repositories
+ * (for collection views and searches)
+ * GET /api/[owner]/[repo]/[branch]/collections/[name]
+ * 
+ * Requires authentication. If type is set to "search", we filter the contents
+ * based on the query and fields parameters.
+ */
+
 export async function GET(
   request: NextRequest,
   { params }: { params: { owner: string, repo: string, branch: string, name: string } }
diff --git a/app/api/[owner]/[repo]/[branch]/entries/[path]/history/route.ts b/app/api/[owner]/[repo]/[branch]/entries/[path]/history/route.ts
index 70c35107..4f760e03 100644
--- a/app/api/[owner]/[repo]/[branch]/entries/[path]/history/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/entries/[path]/history/route.ts
@@ -6,6 +6,13 @@ import { getFileExtension, normalizePath } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
 
+/**
+ * Fetches the history of a file from GitHub repositories.
+ * GET /api/[owner]/[repo]/[branch]/entries/[path]/history
+ * 
+ * Requires authentication.
+ */
+
 export async function GET(
   request: NextRequest,
   { params }: { params: { owner: string, repo: string, branch: string, path: string } }
diff --git a/app/api/[owner]/[repo]/[branch]/entries/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/entries/[path]/route.ts
index 7bf08795..16998fe6 100644
--- a/app/api/[owner]/[repo]/[branch]/entries/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/entries/[path]/route.ts
@@ -8,6 +8,15 @@ import { getFileExtension, normalizePath } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
 
+/**
+ * Fetches and parses individual file contents from GitHub repositories
+ * (usually for editing).
+ * GET /api/[owner]/[repo]/[branch]/entries/[path]?name=[schemaName]
+ * 
+ * Requires authentication. If no schema name is provided, we return the raw
+ * contents.
+ */
+
 export async function GET(
   request: NextRequest,
   { params }: { params: { owner: string, repo: string, branch: string, path: string } }
diff --git a/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts b/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
index 13fab5d3..d15ff7d9 100644
--- a/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
@@ -5,6 +5,13 @@ import { getFileExtension, normalizePath } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
 
+/**
+ * Renames a file in a GitHub repository.
+ * POST /api/[owner]/[repo]/[branch]/files/[path]/rename
+ *
+ * Requires authentication.
+ */
+
 export async function POST(
   request: Request,
   { params }: { params: { owner: string, repo: string, branch: string, path: string } }
diff --git a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
index a241c3df..e3d17129 100644
--- a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
@@ -9,6 +9,14 @@ import { getFileExtension, getFileName, normalizePath, serializedTypes } from "@
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
 
+/**
+ * Create, update and delete individual files in a GitHub repository.
+ * POST /api/[owner]/[repo]/[branch]/files/[path]
+ * DELETE /api/[owner]/[repo]/[branch]/files/[path]
+ * 
+ * Requires authentication.
+ */
+
 export async function POST(
   request: Request,
   { params }: { params: { owner: string, repo: string, branch: string, path: string } }
diff --git a/fields/core/reference/edit-component.tsx b/fields/core/reference/edit-component.tsx
index 47315841..579fd4a2 100644
--- a/fields/core/reference/edit-component.tsx
+++ b/fields/core/reference/edit-component.tsx
@@ -24,12 +24,13 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
       path: collection.path,
       type: "search",
       query: "{input}",
-      fields: field.options.search || "name"
+      fields: field.options?.search || "name"
     },
     minlength: 2,
     results: "data.contents",
-    value: field.options.value || "{path}",
-    label: field.options.label || "{name}",
+    value: field.options?.value || "{path}",
+    label: field.options?.label || "{name}",
+    image: field.options?.image,
     headers: {},
   }), [config.owner, config.repo, config.branch, field.options]);
 
diff --git a/fields/core/select/edit-component.tsx b/fields/core/select/edit-component.tsx
index 64966846..6e54b6d4 100644
--- a/fields/core/select/edit-component.tsx
+++ b/fields/core/select/edit-component.tsx
@@ -100,11 +100,11 @@ const EditComponent = forwardRef((props: any, ref: any) => {
           Object.entries(fetchConfig.params).forEach(([key, paramValue]) => {
             if (Array.isArray(paramValue)) {
               paramValue.forEach(value => {
-                const interpolatedValue = interpolate(value, { input });
+                const interpolatedValue = interpolate(value, { input }, "fields");
                 searchParams.append(key, interpolatedValue);
               });
             } else {
-              const value = interpolate(paramValue, { input });
+              const value = interpolate(paramValue, { input }, "fields");
               searchParams.append(key, value);
             }
           });
@@ -123,13 +123,13 @@ const EditComponent = forwardRef((props: any, ref: any) => {
         if (!Array.isArray(results)) return [];
         return results.map((item: any) => ({
           value: fetchConfig.value ? 
-            interpolate(fetchConfig.value, item)
+            interpolate(fetchConfig.value, item, "fields")
             : item.id,
           label: fetchConfig.label ?
-            interpolate(fetchConfig.label, item)
+            interpolate(fetchConfig.label, item, "fields")
             : item.name,
           image: fetchConfig.image ? 
-            interpolate(fetchConfig.image, item)
+            interpolate(fetchConfig.image, item, "fields")
             : undefined,
         }));
       } catch (error) {
diff --git a/lib/schema.ts b/lib/schema.ts
index c5bd0478..b5cd212f 100644
--- a/lib/schema.ts
+++ b/lib/schema.ts
@@ -240,10 +240,17 @@ function safeAccess(obj: Record<string, any>, path: string) {
   }, obj);
 }
 
-// Interpolate a string with a data object (e.g. {field.name} -> data.field.name)
-function interpolate(input: string, data: Record<string, any>): string {
+// Interpolate a string with a data object, with optional prefix fallback (e.g. "fields")
+function interpolate(input: string, data: Record<string, any>, prefixFallback?: string): string {
   return input.replace(/(?<!\\)\{([^}]+)\}/g, (_, token) => {
-    const value = safeAccess(data, token);
+    // First try direct access
+    let value = safeAccess(data, token);
+    
+    // If value is undefined and we have a prefix fallback, try with prefix
+    if (value === undefined && prefixFallback) {
+      value = safeAccess(data, `${prefixFallback}.${token}`);
+    }
+    
     return value !== undefined ? String(value) : '';
   }).replace(/\\([{}])/g, '$1');
 }

From 7d011ef9df9520cda1085b2c602c90e86b80cde3 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 14 Mar 2025 12:06:32 +0800
Subject: [PATCH 26/95] Updating cache on individual file operations

---
 .../[repo]/[branch]/files/[path]/route.ts     | 27 +++++++
 app/api/auth/email/[token]/route.ts           |  7 ++
 app/api/auth/github/route.ts                  |  7 ++
 app/api/collaborators/[...slug]/route.ts      |  7 ++
 app/api/repos/[owner]/route.ts                |  7 ++
 app/api/tracker/route.ts                      |  8 +++
 app/api/webhook/github/route.ts               | 11 ++-
 lib/githubCache.ts                            | 70 ++++++++++++++++++-
 8 files changed, 142 insertions(+), 2 deletions(-)

diff --git a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
index e3d17129..4f437496 100644
--- a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
@@ -8,6 +8,7 @@ import { getConfig, updateConfig } from "@/lib/utils/config";
 import { getFileExtension, getFileName, normalizePath, serializedTypes } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
+import { updateFileCache } from "@/lib/githubCache";
 
 /**
  * Create, update and delete individual files in a GitHub repository.
@@ -151,6 +152,21 @@ export async function POST(
       await updateConfig(newConfig);
     }
     
+    // Update cache for content and settings files, but not media
+    if (response?.data.content && response?.data.commit && data.type !== "media") {
+      await updateFileCache(
+        params.owner,
+        params.repo,
+        params.branch,
+        {
+          type: data.sha ? 'modify' : 'add',
+          path: response.data.content.path!,
+          sha: response.data.content.sha!,
+          content: Buffer.from(contentBase64, 'base64').toString('utf-8')
+        }
+      );
+    }
+
     return Response.json({
       status: "success",
       message: savedPath !== normalizedPath
@@ -289,6 +305,17 @@ export async function DELETE(
       message: `Delete ${params.path} (via Pages CMS)`,
     });
 
+    // Update cache after successful deletion
+    await updateFileCache(
+      params.owner,
+      params.repo,
+      params.branch,
+      {
+        type: 'delete',
+        path: params.path
+      }
+    );
+
     return Response.json({
       status: "success",
       message: `File "${normalizedPath}" deleted successfully.`,
diff --git a/app/api/auth/email/[token]/route.ts b/app/api/auth/email/[token]/route.ts
index 5d9b7207..79b2413f 100644
--- a/app/api/auth/email/[token]/route.ts
+++ b/app/api/auth/email/[token]/route.ts
@@ -9,6 +9,13 @@ import { eq } from "drizzle-orm";
 import { db } from "@/db";
 import { emailLoginTokenTable, userTable } from "@/db/schema";
 
+/**
+ * Handles email login authentication (for collaborators).
+ * GET /api/auth/email/[token]
+ * 
+ * Requires email login token.
+ */
+
 export async function GET(
 	request: Request,
 	{ params }: { params: { token: string } }
diff --git a/app/api/auth/github/route.ts b/app/api/auth/github/route.ts
index 2499c9b6..a823157c 100644
--- a/app/api/auth/github/route.ts
+++ b/app/api/auth/github/route.ts
@@ -8,6 +8,13 @@ import { db } from "@/db";
 import { userTable, githubUserTokenTable } from "@/db/schema";
 import { eq } from "drizzle-orm";
 
+/**
+ * Handles GitHub OAuth authentication.
+ * GET /api/auth/github
+ * 
+ * Requires GitHub OAuth code and state.
+ */
+
 export async function GET(request: Request): Promise<Response> {
 	const { session } = await getAuth();
   if (session) return redirect("/");
diff --git a/app/api/collaborators/[...slug]/route.ts b/app/api/collaborators/[...slug]/route.ts
index 9442129b..fb15c17a 100644
--- a/app/api/collaborators/[...slug]/route.ts
+++ b/app/api/collaborators/[...slug]/route.ts
@@ -6,6 +6,13 @@ import { db } from "@/db";
 import { collaboratorTable } from "@/db/schema";
 import { getInstallations, getInstallationRepos } from "@/lib/githubApp";
 
+/**
+ * Fetches collaborators for a repository.
+ * GET /api/collaborators/[owner]/[repo]
+ * 
+ * Requires authentication. Only accessible to GitHub users (not collaborators).
+ */
+
 export async function GET(
   request: NextRequest,
   { params }: { params: { slug: string[] } }
diff --git a/app/api/repos/[owner]/route.ts b/app/api/repos/[owner]/route.ts
index e546af3a..73b554d3 100644
--- a/app/api/repos/[owner]/route.ts
+++ b/app/api/repos/[owner]/route.ts
@@ -9,6 +9,13 @@ import { collaboratorTable } from "@/db/schema";
 
 export const dynamic = "force-dynamic";
 
+/**
+ * Fetches repositories for a user.
+ * GET /api/repos/[owner]
+ * 
+ * Requires authentication.
+ */
+
 export async function GET(
   request: NextRequest,
   { params }: { params: { owner: string } }
diff --git a/app/api/tracker/route.ts b/app/api/tracker/route.ts
index ea60182f..0a0b31b0 100644
--- a/app/api/tracker/route.ts
+++ b/app/api/tracker/route.ts
@@ -4,6 +4,14 @@ import { db } from "@/db";
 import { historyTable } from "@/db/schema";
 import { z } from "zod";
 
+/**
+ * Fetches and updates user's history of visits to repositories.
+ * GET /api/tracker
+ * POST /api/tracker
+ * 
+ * Requires authentication.
+ */
+
 export async function GET(request: Request) {
   try {
     const { user, session } = await getAuth();
diff --git a/app/api/webhook/github/route.ts b/app/api/webhook/github/route.ts
index f14485c1..096a814f 100644
--- a/app/api/webhook/github/route.ts
+++ b/app/api/webhook/github/route.ts
@@ -7,6 +7,16 @@ import { normalizePath } from "@/lib/utils/file";
 import { updateCache } from "@/lib/githubCache";
 import { getInstallationToken } from "@/lib/token";
 
+/**
+ * Handles GitHub webhooks:
+ * - Maintains tables related to GitHub installations (e.g. collaborators,
+ *   installation tokens)
+ * - Maintains GitHub cache
+ * POST /api/webhook/github
+ * 
+ * Requires GitHub App webhook secret and signature.
+ */
+
 export async function POST(request: Request) {
   try {
     const signature = request.headers.get("X-Hub-Signature-256");
@@ -90,7 +100,6 @@ export async function POST(request: Request) {
             }))
           );
 
-          // TODO: verify this is secure
           const installationToken = await getInstallationToken(owner, repo);
 
           await updateCache(
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index e3197e73..f32d2df5 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -9,6 +9,13 @@ type FileChange = {
   sha: string;
 };
 
+type FileOperation = {
+  type: 'add' | 'modify' | 'delete';
+  path: string;
+  sha?: string;
+  content?: string;
+};
+
 const updateCache = async (
   owner: string,
   repo: string,
@@ -211,4 +218,65 @@ const getCachedCollection = async (
   return entries;
 }
 
-export { updateCache, getCachedCollection };
\ No newline at end of file
+const updateFileCache = async (
+  owner: string,
+  repo: string,
+  branch: string,
+  operation: FileOperation
+) => {
+  const parentPath = path.dirname(operation.path);
+
+  switch (operation.type) {
+    case 'delete':
+      await db.delete(cachedEntriesTable).where(
+        and(
+          eq(cachedEntriesTable.owner, owner),
+          eq(cachedEntriesTable.repo, repo),
+          eq(cachedEntriesTable.branch, branch),
+          eq(cachedEntriesTable.path, operation.path)
+        )
+      );
+      break;
+
+    case 'add':
+    case 'modify':
+      if (operation.content === undefined || !operation.sha) {
+        throw new Error('Content and SHA are required for add/modify operations');
+      }
+
+      const entry = {
+        owner,
+        repo,
+        branch,
+        path: operation.path,
+        parentPath,
+        name: path.basename(operation.path),
+        type: 'blob',
+        content: operation.content,
+        sha: operation.sha,
+        lastUpdated: Date.now()
+      };
+
+      if (operation.type === 'modify') {
+        await db.update(cachedEntriesTable)
+          .set({
+            content: entry.content,
+            sha: entry.sha,
+            lastUpdated: entry.lastUpdated
+          })
+          .where(
+            and(
+              eq(cachedEntriesTable.owner, owner),
+              eq(cachedEntriesTable.repo, repo),
+              eq(cachedEntriesTable.branch, branch),
+              eq(cachedEntriesTable.path, operation.path)
+            )
+          );
+      } else {
+        await db.insert(cachedEntriesTable).values(entry);
+      }
+      break;
+  }
+};
+
+export { updateCache, getCachedCollection, updateFileCache };
\ No newline at end of file

From e65f8a319bcf681230b859fa03104f29d320d88f Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 14 Mar 2025 15:40:28 +0800
Subject: [PATCH 27/95] Cleaning up and testing migration

---
 app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts | 2 --
 fields/core/select/edit-component.tsx                       | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
index d2dbc7a1..7e311598 100644
--- a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
@@ -57,8 +57,6 @@ export async function GET(
     
     if (entries) {
       data = parseContents(entries, schema, config);
-
-      console.log("data", JSON.stringify(data, null, 2));
       
       // If this is a search request, filter the contents
       if (type === "search" && query) {
diff --git a/fields/core/select/edit-component.tsx b/fields/core/select/edit-component.tsx
index 6e54b6d4..1279fb6f 100644
--- a/fields/core/select/edit-component.tsx
+++ b/fields/core/select/edit-component.tsx
@@ -67,7 +67,7 @@ type FetchConfig = {
 
 const EditComponent = forwardRef((props: any, ref: any) => {
   const { value, field, onChange } = props;
-  console.log('select field', field);
+  
   const [isMounted, setIsMounted] = useState(false);
 
   useEffect(() => setIsMounted(true), []);

From a27934efdf2914afbe2a424c619dd4a4cd666d4a Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 14 Mar 2025 16:26:36 +0800
Subject: [PATCH 28/95] Fixed validation for reference

---
 fields/core/reference/index.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/fields/core/reference/index.tsx b/fields/core/reference/index.tsx
index 3dd612f7..762c0f1c 100644
--- a/fields/core/reference/index.tsx
+++ b/fields/core/reference/index.tsx
@@ -1,3 +1,15 @@
+import { z } from "zod";
+import { Field } from "@/types/field";
 import { EditComponent } from "./edit-component";
 
-export { EditComponent };
\ No newline at end of file
+const schema = (field: Field) => {
+  let zodSchema: z.ZodTypeAny = z.coerce.string();
+
+  if (field.options?.multiple) zodSchema = z.array(zodSchema);
+  
+  if (!field.required) zodSchema = zodSchema.optional();
+  
+  return zodSchema;
+};
+
+export { schema, EditComponent };
\ No newline at end of file

From 877078afd3f79e4557ff1fa8535ddddeddee799e Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 14 Mar 2025 17:28:15 +0800
Subject: [PATCH 29/95] Adding custm icons

---
 components/icon.tsx          | 30 ++++++++++++++++++++++++++++++
 components/repo/repo-nav.tsx | 13 +++++++++----
 package-lock.json            | 11 ++++++-----
 package.json                 |  2 +-
 4 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 components/icon.tsx

diff --git a/components/icon.tsx b/components/icon.tsx
new file mode 100644
index 00000000..83b10199
--- /dev/null
+++ b/components/icon.tsx
@@ -0,0 +1,30 @@
+"use client";
+
+import { useState, useEffect } from "react";
+import { DynamicIcon } from "lucide-react/dynamic";
+import type { LucideProps } from "lucide-react";
+
+interface IconProps extends Omit<LucideProps, "ref"> {
+  name?: string;
+  fallback: React.ReactNode;
+}
+
+export function Icon({ name, fallback, ...props }: IconProps) {
+  const [error, setError] = useState(!name);
+
+  useEffect(() => {
+    setError(!name);
+  }, [name]);
+
+  if (error) {
+    return <>{fallback}</>;
+  }
+
+  return (
+    <DynamicIcon 
+      name={name as any}
+      {...props}
+      onError={() => setError(true)}
+    />
+  );
+} 
\ No newline at end of file
diff --git a/components/repo/repo-nav.tsx b/components/repo/repo-nav.tsx
index 6486ed84..e5619542 100644
--- a/components/repo/repo-nav.tsx
+++ b/components/repo/repo-nav.tsx
@@ -7,6 +7,7 @@ import { useConfig } from "@/contexts/config-context";
 import { useUser } from "@/contexts/user-context";
 import { cn } from "@/lib/utils";
 import { FileStack, FileText, Image as ImageIcon, Settings, Users } from "lucide-react";
+import { Icon } from "@/components/icon";
 
 const RepoNavItem = ({
   children,
@@ -48,10 +49,14 @@ const RepoNav = ({
     const configObject: any = config.object;
     const contentItems = configObject.content?.map((item: any) => ({
       key: item.name,
-      icon: item.type === "collection"
-        ? <FileStack className="h-5 w-5 mr-2" />
-        : <FileText className="h-5 w-5 mr-2" />
-      ,
+      icon: <Icon 
+        className="h-5 w-5 mr-2"
+        name={item.icon}
+        fallback={item.type === "collection" 
+          ? <FileStack className="h-5 w-5 mr-2" /> 
+          : <FileText className="h-5 w-5 mr-2" />
+        }
+      />,
       href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/${item.type}/${encodeURIComponent(item.name)}`,
       label: item.label || item.name,
     })) || [];
diff --git a/package-lock.json b/package-lock.json
index 026c3141..b414c3f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -63,7 +63,7 @@
         "install": "^0.13.0",
         "joplin-turndown-plugin-gfm": "^1.0.12",
         "lucia": "^3.2.0",
-        "lucide-react": "^0.378.0",
+        "lucide-react": "^0.479.0",
         "marked": "^12.0.2",
         "next": "^14.2.20",
         "next-themes": "^0.3.0",
@@ -8591,11 +8591,12 @@
       }
     },
     "node_modules/lucide-react": {
-      "version": "0.378.0",
-      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.378.0.tgz",
-      "integrity": "sha512-u6EPU8juLUk9ytRcyapkWI18epAv3RU+6+TC23ivjR0e+glWKBobFeSgRwOIJihzktILQuy6E0E80P2jVTDR5g==",
+      "version": "0.479.0",
+      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.479.0.tgz",
+      "integrity": "sha512-aBhNnveRhorBOK7uA4gDjgaf+YlHMdMhQ/3cupk6exM10hWlEU+2QtWYOfhXhjAsmdb6LeKR+NZnow4UxRRiTQ==",
+      "license": "ISC",
       "peerDependencies": {
-        "react": "^16.5.1 || ^17.0.0 || ^18.0.0"
+        "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/markdown-it": {
diff --git a/package.json b/package.json
index 56984248..a9cdbcc6 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "install": "^0.13.0",
     "joplin-turndown-plugin-gfm": "^1.0.12",
     "lucia": "^3.2.0",
-    "lucide-react": "^0.378.0",
+    "lucide-react": "^0.479.0",
     "marked": "^12.0.2",
     "next": "^14.2.20",
     "next-themes": "^0.3.0",

From 9e118cb98629f196af1378e63f57b49737a0065c Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 14 Mar 2025 17:31:59 +0800
Subject: [PATCH 30/95] Adding contributing guidelines

---
 CONTRIBUTING.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..5c4fe106
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,8 @@
+# Contributing to Pages CMS
+
+- Submit pull requests (PRs) against the `development` branch, not `main`.
+- Keep changes focused: one feature or fix per PR.
+- Test locally before submitting.
+- Follow existing code style.
+
+Thanks for helping!
\ No newline at end of file

From f50d5e8cb050ae2b694ea068f0c474e8413128a4 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 14 Mar 2025 17:42:39 +0800
Subject: [PATCH 31/95] Fixing #177

---
 fields/core/image/edit-component.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fields/core/image/edit-component.tsx b/fields/core/image/edit-component.tsx
index 4da17d2f..2b57be66 100644
--- a/fields/core/image/edit-component.tsx
+++ b/fields/core/image/edit-component.tsx
@@ -156,6 +156,7 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
               selected={images.map((image: any) => image.path)}
               onSubmit={handleSubmit}
               maxSelected={maxImages}
+              initialPath={field.options?.path}
             >
               <Button type="button" variant="outline" className="h-28 w-28">
                 <div className="flex flex-col items-center gap-y-1 text-sm">

From ecda21991e09e2f9d9808a64c751281762f07eba Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 14 Mar 2025 21:27:02 +0800
Subject: [PATCH 32/95] Fixing handling of frontmatter for json-frontmatter,
 remove Lucide icons from bundle.

---
 components/icon.tsx          | 30 ------------------------------
 components/repo/repo-nav.tsx | 13 ++++---------
 lib/serialization.ts         | 19 +++++++++++++++++--
 3 files changed, 21 insertions(+), 41 deletions(-)
 delete mode 100644 components/icon.tsx

diff --git a/components/icon.tsx b/components/icon.tsx
deleted file mode 100644
index 83b10199..00000000
--- a/components/icon.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-"use client";
-
-import { useState, useEffect } from "react";
-import { DynamicIcon } from "lucide-react/dynamic";
-import type { LucideProps } from "lucide-react";
-
-interface IconProps extends Omit<LucideProps, "ref"> {
-  name?: string;
-  fallback: React.ReactNode;
-}
-
-export function Icon({ name, fallback, ...props }: IconProps) {
-  const [error, setError] = useState(!name);
-
-  useEffect(() => {
-    setError(!name);
-  }, [name]);
-
-  if (error) {
-    return <>{fallback}</>;
-  }
-
-  return (
-    <DynamicIcon 
-      name={name as any}
-      {...props}
-      onError={() => setError(true)}
-    />
-  );
-} 
\ No newline at end of file
diff --git a/components/repo/repo-nav.tsx b/components/repo/repo-nav.tsx
index e5619542..6486ed84 100644
--- a/components/repo/repo-nav.tsx
+++ b/components/repo/repo-nav.tsx
@@ -7,7 +7,6 @@ import { useConfig } from "@/contexts/config-context";
 import { useUser } from "@/contexts/user-context";
 import { cn } from "@/lib/utils";
 import { FileStack, FileText, Image as ImageIcon, Settings, Users } from "lucide-react";
-import { Icon } from "@/components/icon";
 
 const RepoNavItem = ({
   children,
@@ -49,14 +48,10 @@ const RepoNav = ({
     const configObject: any = config.object;
     const contentItems = configObject.content?.map((item: any) => ({
       key: item.name,
-      icon: <Icon 
-        className="h-5 w-5 mr-2"
-        name={item.icon}
-        fallback={item.type === "collection" 
-          ? <FileStack className="h-5 w-5 mr-2" /> 
-          : <FileText className="h-5 w-5 mr-2" />
-        }
-      />,
+      icon: item.type === "collection"
+        ? <FileStack className="h-5 w-5 mr-2" />
+        : <FileText className="h-5 w-5 mr-2" />
+      ,
       href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/${item.type}/${encodeURIComponent(item.name)}`,
       label: item.label || item.name,
     })) || [];
diff --git a/lib/serialization.ts b/lib/serialization.ts
index c96e03eb..0f3f7e2c 100644
--- a/lib/serialization.ts
+++ b/lib/serialization.ts
@@ -26,8 +26,18 @@ const parse = (content: string = "", options: { delimiters?: string, format?: Fo
   let contentObject;
   
   if (!match) return { body: content };
+
+  // For json-frontmatter and default delimiters (curly braces), we need the
+  // with the delimiters included to be a valid JSON object.
+  const frontMatter = (
+    format === "json-frontmatter" &&
+    delimiters[0] === "{" &&
+    delimiters[1] === "}"
+  )
+    ? match[1]
+    : match[2]
   
-  contentObject = deserialize(match[2], format.split("-")[0] as SerialFormat);
+  contentObject = deserialize(frontMatter, format.split("-")[0] as SerialFormat);
   contentObject["body"] = match[3] || "";
   contentObject["body"] = contentObject["body"].replace(/^\n/, "");
 
@@ -61,13 +71,18 @@ const stringify = (contentObject: Record<string, any> = {}, options: { delimiter
   // Frontmatter
   const delimiters = setDelimiter(options.delimiters, format as FrontmatterFormat);
 
-  let contentObjectCopy = JSON.parse(JSON.stringify(contentObject)); // Avoid mutating our object
+  let contentObjectCopy = JSON.parse(JSON.stringify(contentObject));
   const body = contentObjectCopy.body || "";
   delete contentObjectCopy.body;
 
   let frontmatter = serialize(contentObjectCopy, format.split("-")[0] as SerialFormat);
   frontmatter = (frontmatter.trim()) ? frontmatter.trim() + "\n" : ""; // Make sure we don"t have extra newlines
   
+  // For json-frontmatter with default delimiters, the serialized content already includes braces
+  if (format === "json-frontmatter" && delimiters[0] === "{" && delimiters[1] === "}") {
+    return `${frontmatter}${body}`;
+  }
+  
   return `${delimiters[0]}\n${frontmatter}${delimiters[1]}\n${body}`;
 };
 

From 631f484245ac77d74971e95e68fa8b85e745f0d7 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 15 Mar 2025 12:31:54 +0800
Subject: [PATCH 33/95] Adding comments

---
 app/api/[owner]/[repo]/[branch]/branches/route.ts |  1 +
 .../[repo]/[branch]/collections/[name]/route.ts   |  2 ++
 .../[branch]/entries/[path]/history/route.ts      |  1 +
 .../[repo]/[branch]/entries/[path]/route.ts       |  2 ++
 .../[repo]/[branch]/files/[path]/rename/route.ts  |  1 +
 .../[owner]/[repo]/[branch]/files/[path]/route.ts |  3 ++-
 .../[owner]/[repo]/[branch]/media/[path]/route.ts | 10 ++++++++++
 app/api/auth/email/[token]/route.ts               |  1 +
 app/api/auth/github/route.ts                      |  1 +
 app/api/collaborators/[...slug]/route.ts          |  1 +
 app/api/repos/[owner]/route.ts                    |  1 +
 app/api/tracker/route.ts                          |  1 +
 app/api/webhook/github/route.ts                   |  1 +
 lib/actions/app.ts                                |  1 +
 lib/actions/auth.ts                               |  8 ++++++++
 lib/actions/collaborator.ts                       |  2 ++
 lib/actions/template.ts                           |  1 +
 lib/auth.ts                                       |  4 ++++
 lib/config.ts                                     | 15 +++++++++++++++
 lib/configSchema.ts                               | 12 ++++++++++--
 lib/crypto.ts                                     |  8 ++++++++
 lib/githubApp.ts                                  |  7 +++++++
 lib/githubCache.ts                                |  7 +++++++
 lib/githubImage.ts                                | 13 ++++++++++++-
 lib/schema.ts                                     |  1 +
 lib/token.ts                                      |  9 ++++++++-
 lib/utils/accounts.ts                             |  4 ++++
 lib/utils/avatar.ts                               |  4 ++++
 lib/utils/config.ts                               |  8 ++++++++
 lib/utils/file.ts                                 |  9 ++++++++-
 lib/utils/octokit.ts                              |  5 +++++
 lib/utils/templates.ts                            |  4 ++++
 32 files changed, 142 insertions(+), 6 deletions(-)

diff --git a/app/api/[owner]/[repo]/[branch]/branches/route.ts b/app/api/[owner]/[repo]/[branch]/branches/route.ts
index fe9e2a46..8e4d5ccd 100644
--- a/app/api/[owner]/[repo]/[branch]/branches/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/branches/route.ts
@@ -4,6 +4,7 @@ import { getToken } from "@/lib/token";
 
 /**
  * Creates a new branch in a GitHub repository.
+ * 
  * POST /api/[owner]/[repo]/[branch]/branches
  * 
  * Requires authentication.
diff --git a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
index dccc2cbb..156844f5 100644
--- a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
@@ -13,6 +13,7 @@ import { getCachedCollection } from "@/lib/githubCache";
 /**
  * Fetches and parses collection contents from GitHub repositories
  * (for collection views and searches)
+ * 
  * GET /api/[owner]/[repo]/[branch]/collections/[name]
  * 
  * Requires authentication. If type is set to "search", we filter the contents
@@ -95,6 +96,7 @@ export async function GET(
   }
 }
 
+// Parse the list of entries into objects based on the content schema.
 const parseContents = (
   contents: any,
   schema: Record<string, any>,
diff --git a/app/api/[owner]/[repo]/[branch]/entries/[path]/history/route.ts b/app/api/[owner]/[repo]/[branch]/entries/[path]/history/route.ts
index 4f760e03..66b6ac48 100644
--- a/app/api/[owner]/[repo]/[branch]/entries/[path]/history/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/entries/[path]/history/route.ts
@@ -8,6 +8,7 @@ import { getToken } from "@/lib/token";
 
 /**
  * Fetches the history of a file from GitHub repositories.
+ * 
  * GET /api/[owner]/[repo]/[branch]/entries/[path]/history
  * 
  * Requires authentication.
diff --git a/app/api/[owner]/[repo]/[branch]/entries/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/entries/[path]/route.ts
index 16998fe6..0a1e318b 100644
--- a/app/api/[owner]/[repo]/[branch]/entries/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/entries/[path]/route.ts
@@ -11,6 +11,7 @@ import { getToken } from "@/lib/token";
 /**
  * Fetches and parses individual file contents from GitHub repositories
  * (usually for editing).
+ * 
  * GET /api/[owner]/[repo]/[branch]/entries/[path]?name=[schemaName]
  * 
  * Requires authentication. If no schema name is provided, we return the raw
@@ -89,6 +90,7 @@ export async function GET(
   }
 }
 
+// Parse the entry into an object based on the content schema.
 const parseContent = (
   content: string,
   schema: Record<string, any>,
diff --git a/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts b/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
index d15ff7d9..5f2592d6 100644
--- a/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
@@ -7,6 +7,7 @@ import { getToken } from "@/lib/token";
 
 /**
  * Renames a file in a GitHub repository.
+ * 
  * POST /api/[owner]/[repo]/[branch]/files/[path]/rename
  *
  * Requires authentication.
diff --git a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
index 4f437496..78233939 100644
--- a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
@@ -12,6 +12,7 @@ import { updateFileCache } from "@/lib/githubCache";
 
 /**
  * Create, update and delete individual files in a GitHub repository.
+ * 
  * POST /api/[owner]/[repo]/[branch]/files/[path]
  * DELETE /api/[owner]/[repo]/[branch]/files/[path]
  * 
@@ -192,6 +193,7 @@ export async function POST(
   }
 };
 
+// Helper function to save a file to GitHub (with retry logic for new files)
 const githubSaveFile = async (
   token: string,
   owner: string,
@@ -228,7 +230,6 @@ const githubSaveFile = async (
         sha: sha || undefined,
       });
 
-      // TODO: is that really what I have to do here?
       if (response.data.content && response.data.commit) {
         return response;
       } else {
diff --git a/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts
index bce1797e..881e3e9a 100644
--- a/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts
@@ -4,6 +4,16 @@ import { getFileExtension, normalizePath } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
 
+// Add docs
+
+/**
+ * Get the list of media files in a directory.
+ *
+ * GET /api/[owner]/[repo]/[branch]/media/[path]
+ * 
+ * Requires authentication.
+ */
+
 export async function GET(
   request: Request,
   { params }: { params: { owner: string, repo: string, branch: string, path: string } }
diff --git a/app/api/auth/email/[token]/route.ts b/app/api/auth/email/[token]/route.ts
index 79b2413f..38791e03 100644
--- a/app/api/auth/email/[token]/route.ts
+++ b/app/api/auth/email/[token]/route.ts
@@ -11,6 +11,7 @@ import { emailLoginTokenTable, userTable } from "@/db/schema";
 
 /**
  * Handles email login authentication (for collaborators).
+ * 
  * GET /api/auth/email/[token]
  * 
  * Requires email login token.
diff --git a/app/api/auth/github/route.ts b/app/api/auth/github/route.ts
index a823157c..50251caa 100644
--- a/app/api/auth/github/route.ts
+++ b/app/api/auth/github/route.ts
@@ -10,6 +10,7 @@ import { eq } from "drizzle-orm";
 
 /**
  * Handles GitHub OAuth authentication.
+ * 
  * GET /api/auth/github
  * 
  * Requires GitHub OAuth code and state.
diff --git a/app/api/collaborators/[...slug]/route.ts b/app/api/collaborators/[...slug]/route.ts
index fb15c17a..31133570 100644
--- a/app/api/collaborators/[...slug]/route.ts
+++ b/app/api/collaborators/[...slug]/route.ts
@@ -8,6 +8,7 @@ import { getInstallations, getInstallationRepos } from "@/lib/githubApp";
 
 /**
  * Fetches collaborators for a repository.
+ * 
  * GET /api/collaborators/[owner]/[repo]
  * 
  * Requires authentication. Only accessible to GitHub users (not collaborators).
diff --git a/app/api/repos/[owner]/route.ts b/app/api/repos/[owner]/route.ts
index a5ffe75d..852198b7 100644
--- a/app/api/repos/[owner]/route.ts
+++ b/app/api/repos/[owner]/route.ts
@@ -11,6 +11,7 @@ export const dynamic = "force-dynamic";
 
 /**
  * Fetches repositories for a user.
+ * 
  * GET /api/repos/[owner]
  * 
  * Requires authentication.
diff --git a/app/api/tracker/route.ts b/app/api/tracker/route.ts
index 0a0b31b0..a5056155 100644
--- a/app/api/tracker/route.ts
+++ b/app/api/tracker/route.ts
@@ -6,6 +6,7 @@ import { z } from "zod";
 
 /**
  * Fetches and updates user's history of visits to repositories.
+ * 
  * GET /api/tracker
  * POST /api/tracker
  * 
diff --git a/app/api/webhook/github/route.ts b/app/api/webhook/github/route.ts
index 096a814f..bc8e7294 100644
--- a/app/api/webhook/github/route.ts
+++ b/app/api/webhook/github/route.ts
@@ -12,6 +12,7 @@ import { getInstallationToken } from "@/lib/token";
  * - Maintains tables related to GitHub installations (e.g. collaborators,
  *   installation tokens)
  * - Maintains GitHub cache
+ * 
  * POST /api/webhook/github
  * 
  * Requires GitHub App webhook secret and signature.
diff --git a/lib/actions/app.ts b/lib/actions/app.ts
index 232ae723..22dbf97d 100644
--- a/lib/actions/app.ts
+++ b/lib/actions/app.ts
@@ -4,6 +4,7 @@ import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 import { generateState } from "arctic";
 
+// Redirect to the GitHub App installation page.
 const handleAppInstall = async () => {
 	const state = generateState();
 	const url = `https://github.com/apps/${process.env.GITHUB_APP_NAME}/installations/new?state=${encodeURIComponent(state)}`;
diff --git a/lib/actions/auth.ts b/lib/actions/auth.ts
index 761633f3..eaf602ec 100644
--- a/lib/actions/auth.ts
+++ b/lib/actions/auth.ts
@@ -1,5 +1,9 @@
 "use server";
 
+/**
+ * Authentication actions. All handled with Lucia auth, look at `lib/auth.ts` as well.
+ */
+
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 import { generateState } from "arctic";
@@ -15,6 +19,7 @@ import { z } from "zod";
 import { Resend } from "resend";
 import { LoginEmailTemplate } from "@/components/email/login";
 
+// Create a login token for the user.
 async function createLoginToken(email: string): Promise<string> {
 	await db.delete(emailLoginTokenTable).where(eq(emailLoginTokenTable.email, email));
 	const tokenId = generateIdFromEntropySize(25);
@@ -27,6 +32,7 @@ async function createLoginToken(email: string): Promise<string> {
 	return tokenId;
 }
 
+// Send a sign in link to the user's email.
 const handleEmailSignIn = async (prevState: any, formData: FormData) => {
   const validation = z.coerce.string().email().safeParse(formData.get("email"));
 
@@ -59,6 +65,7 @@ const handleEmailSignIn = async (prevState: any, formData: FormData) => {
 	return { message: "We've sent you a link to sign in. If you don't see it, check your spam folder." };	
 };
 
+// Redirect to the GitHub sign in page.
 const handleGithubSignIn = async () => {
   const state = generateState();
 	const url = await github.createAuthorizationURL(state, { scopes: ["repo", "user:email"] });
@@ -74,6 +81,7 @@ const handleGithubSignIn = async () => {
 	return redirect(url.href);
 };
 
+// Sign out the user.
 const handleSignOut = async () => {
 	const { session } = await getAuth();
 	if (!session) return { error: "Unauthorized" };
diff --git a/lib/actions/collaborator.ts b/lib/actions/collaborator.ts
index 80f89f16..243f013c 100644
--- a/lib/actions/collaborator.ts
+++ b/lib/actions/collaborator.ts
@@ -10,6 +10,7 @@ import { and, eq} from "drizzle-orm";
 import { collaboratorTable } from "@/db/schema";
 import { z } from "zod";
 
+// Invite a collaborator to a repository.
 const handleAddCollaborator = async (prevState: any, formData: FormData) => {
 	try {
 		// TODO: remove the requirement for Github account, let any collaborator invite others
@@ -101,6 +102,7 @@ const handleAddCollaborator = async (prevState: any, formData: FormData) => {
 	}
 };
 
+// Remove a collaborator from a repository.
 const handleRemoveCollaborator = async (collaboratorId: number, owner: string, repo: string) => {
 	try {
 		const { user } = await getAuth();
diff --git a/lib/actions/template.ts b/lib/actions/template.ts
index c7704ff3..fe493360 100644
--- a/lib/actions/template.ts
+++ b/lib/actions/template.ts
@@ -7,6 +7,7 @@ import { getUserToken } from "@/lib/token";
 import templates from "@/lib/utils/templates";
 import { z } from "zod";
 
+// Copy a template repository.
 const handleCopyTemplate = async (prevState: any, formData: FormData) => {
   try {
 		const { user } = await getAuth();
diff --git a/lib/auth.ts b/lib/auth.ts
index c5e409a2..71269c2d 100644
--- a/lib/auth.ts
+++ b/lib/auth.ts
@@ -1,3 +1,7 @@
+/**
+ * Auth helper functions for Lucia auth.
+ */
+
 import { cache } from "react";
 import { Session, User, Lucia } from "lucia";
 import { DrizzleSQLiteAdapter, SQLiteSessionTable, SQLiteUserTable } from "@lucia-auth/adapter-drizzle";
diff --git a/lib/config.ts b/lib/config.ts
index be57b1d6..7190d483 100644
--- a/lib/config.ts
+++ b/lib/config.ts
@@ -1,3 +1,10 @@
+/**
+ * Functions to parse, normalize and validate the configuration file.
+ * 
+ * Look at the `lib/utils/config.ts` file to understand how the config is
+ * retrieved, saved and updated in the DB.
+ */
+
 import YAML from "yaml";
 import { getFileExtension, extensionCategories } from "@/lib/utils/file";
 import { ConfigSchema } from "@/lib/configSchema";
@@ -5,6 +12,7 @@ import { z } from "zod";
 
 const configVersion = "2.0";
 
+// Parse the config file (YAML to JSON)
 const parseConfig = (content: string) => {
   const document = YAML.parseDocument(content, { strict: false, prettyErrors: false });
 
@@ -21,6 +29,8 @@ const parseConfig = (content: string) => {
   return { document, errors };
 };
 
+// Normalize the config object (e.g. convert media.input to a relative path, set
+// default values for filename, extension, format, etc.)
 const normalizeConfig = (configObject: any) => {
   if (!configObject) return {};
 
@@ -105,6 +115,8 @@ const normalizeConfig = (configObject: any) => {
   return configObjectCopy;
 }
 
+// Check if the config is valid with the the Zoc schema (lib/configSchema.ts).
+// This is used in the settings editor.
 const validateConfig = (document: YAML.Document.Parsed) => {
   const content = document.toJSON();
   let errors: any[] = [];
@@ -122,6 +134,8 @@ const validateConfig = (document: YAML.Document.Parsed) => {
   return errors;
 };
 
+// Process the Zod errors from the validateConfig function. Helps us display errors
+// in the settings editor.
 const processZodError = (error: any, document: YAML.Document.Parsed, errors: any[]) => {
   let path = error.path;
   let yamlNode: any = document.getIn(path, true);
@@ -187,6 +201,7 @@ const processZodError = (error: any, document: YAML.Document.Parsed, errors: any
   }
 };
 
+// Parse the config file and validate it (used in the settings editor).
 const parseAndValidateConfig = (content: string) => {
   const { document, errors: parseErrors } = parseConfig(content);
   const validationErrors = validateConfig(document);
diff --git a/lib/configSchema.ts b/lib/configSchema.ts
index 88973ebf..002e6d9b 100644
--- a/lib/configSchema.ts
+++ b/lib/configSchema.ts
@@ -1,5 +1,12 @@
+/**
+ * The Zod schema for the configuration file. Used in the settings editor.
+ * 
+ * Look at the `lib/config.ts` file to understand how we use this schema.
+ */
+
 import { z } from "zod";
 
+// Media schema
 const MediaSchema = z.union([
   z.string().regex(/^[^/].*[^/]$|^$/, {
     message: "'media' must be a valid relative path (no leading or trailing slash)."
@@ -33,6 +40,7 @@ const MediaSchema = z.union([
   }).strict()
 ]);
 
+// Content entry fields schema
 const FieldObjectSchema: z.ZodType<any> = z.lazy(() => z.object({
   name: z.string({
     required_error: "'name' is required.",
@@ -89,7 +97,7 @@ const FieldObjectSchema: z.ZodType<any> = z.lazy(() => z.object({
   fields: z.array(z.lazy(() => FieldObjectSchema)).optional(),
 }).strict());
 
-// Define the schema for content objects
+// Content entry schema
 const ContentObjectSchema = z.object({
   name: z.string({
     required_error: "'name' is required.",
@@ -178,7 +186,7 @@ const ContentObjectSchema = z.object({
   message: "YOP"
 }).strict();
 
-// Define the main schema
+// Main schema with media and content
 const ConfigSchema = z.object({
   media: MediaSchema.optional(),
   content: z.array(ContentObjectSchema, {
diff --git a/lib/crypto.ts b/lib/crypto.ts
index f11712fe..f1fd7bc5 100644
--- a/lib/crypto.ts
+++ b/lib/crypto.ts
@@ -1,3 +1,11 @@
+/**
+ * Utility functions to encrypt and decrypt text using AES-GCM. Used to secure
+ * info in the DB (e.g. GitHub tokens).
+ * 
+ * Requires a CRYPTO_KEY environment variable to be set.
+ */
+
+// Import the key from the CRYPTO_KEY environment variable
 const importKey = async (base64Key: string) => {
   const rawKey = Uint8Array.from(atob(base64Key), c => c.charCodeAt(0));
   return crypto.subtle.importKey(
diff --git a/lib/githubApp.ts b/lib/githubApp.ts
index 9daabdda..b84366f8 100644
--- a/lib/githubApp.ts
+++ b/lib/githubApp.ts
@@ -1,5 +1,11 @@
+
+/**
+ * Helper functions to get GitHub Appinstallations info.
+ */
+
 import { createOctokitInstance } from "@/lib/utils/octokit";
 
+// Get all GitHub App installations for the authenticated user.
 const getInstallations = async (
   token: string,
   owners?: string[],
@@ -48,6 +54,7 @@ const getInstallations = async (
   return matchedInstallations.length ? matchedInstallations : installations;
 };
 
+// Get all repositories for a GitHub App installation.)
 const getInstallationRepos = async (
   token: string,
   installationId: number,
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index f32d2df5..e477e476 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -1,3 +1,7 @@
+/**
+ * Herlper functions to manage the database cache.
+ */
+
 import { db } from "@/db";
 import { eq, and, inArray } from "drizzle-orm";
 import { cachedEntriesTable } from "@/db/schema";
@@ -16,6 +20,7 @@ type FileOperation = {
   content?: string;
 };
 
+// Bulk update cache entries (removed, modified and added files).
 const updateCache = async (
   owner: string,
   repo: string,
@@ -147,6 +152,7 @@ const updateCache = async (
   }
 }
 
+// Attempt to get a collection from cache, if not found, fetch from GitHub.
 const getCachedCollection = async (
   owner: string,
   repo: string,
@@ -218,6 +224,7 @@ const getCachedCollection = async (
   return entries;
 }
 
+// Update the cache for an individual file (add, modify and delete).
 const updateFileCache = async (
   owner: string,
   repo: string,
diff --git a/lib/githubImage.ts b/lib/githubImage.ts
index e7d8c578..fcc485e3 100644
--- a/lib/githubImage.ts
+++ b/lib/githubImage.ts
@@ -1,5 +1,8 @@
 /**
- * Convert image paths into raw.githubusercontent.com URLs (with some light caching).
+ * Helper functions to translate relative paths into publicly accessible GitHub
+ * raw.githubusercontent.com URLs (with some light caching). This is especially
+ * useful for images in private repositories since we can only access them via
+ * a temporary URL provided by the GitHub API.
  */
 
 import { getFileName, getParentPath } from "@/lib/utils/file";
@@ -8,6 +11,7 @@ const ttl = 10000; // TTL for the cache (in milliseconds)
 const cache: { [key: string]: any } = {};
 const requests: { [key: string]: Promise<any> } = {};
 
+// Get the relative path for an image.
 const getRelativeUrl = (
   owner: string,
   repo: string,
@@ -26,6 +30,7 @@ const getRelativeUrl = (
   return encode ? encodePath(relativePath) : relativePath;
 }
 
+// Get the raw.githubusercontent.com URL for an image.
 const getRawUrl = async (
   owner: string,
   repo: string,
@@ -78,6 +83,7 @@ const getRawUrl = async (
   }
 };
 
+// Convert all raw.githubusercontent.com URLs in a HTML string to relative paths.
 const rawToRelativeUrls = (
   owner: string,
   repo: string,
@@ -103,6 +109,7 @@ const rawToRelativeUrls = (
   return html;
 }
 
+// Convert all relative image paths in a HTML string to raw.githubusercontent.com URLs.
 const relativeToRawUrls = async (
   owner: string,
   repo: string,
@@ -130,6 +137,7 @@ const relativeToRawUrls = async (
   return newHtml;
 }
 
+// Swap the prefix of an image path (raw.githubusercontent.com url <> relative path)
 const swapPrefix = (
   path: string,
   from: string,
@@ -157,6 +165,7 @@ const swapPrefix = (
   return newPath;
 }
 
+// Swap the prefix of all images in a HTML string.
 const htmlSwapPrefix = (
   html: string,
   from: string,
@@ -191,10 +200,12 @@ const htmlSwapPrefix = (
   return newHtml;
 }
 
+// Encode a path for use in a URL.
 const encodePath = (path: string) => {
   return path.split("/").map(encodeURIComponent).join("/");
 }
 
+// Get all image sources from an HTML string.
 const getImgSrcs = (html: string) => {
   const regex = /<img [^>]*src=(?:"([^"]+)"|'([^']+)')[^>]*>/g;
   return Array.from(html.matchAll(regex));
diff --git a/lib/schema.ts b/lib/schema.ts
index b5cd212f..279c393f 100644
--- a/lib/schema.ts
+++ b/lib/schema.ts
@@ -8,6 +8,7 @@ import { z } from "zod";
 import { Field } from "@/types/field";
 import { format } from "date-fns";
 
+// Deep map a content object to a schema
 const deepMap = (
   contentObject: Record<string, any>,
   fields: Field[],
diff --git a/lib/token.ts b/lib/token.ts
index cfb0686d..9bc2d25c 100644
--- a/lib/token.ts
+++ b/lib/token.ts
@@ -1,5 +1,9 @@
+/**
+ * Token helper functions.
+ */
+
 import { cache } from "react";
-import { App, Octokit } from "octokit";
+import { App } from "octokit";
 import { getAuth } from "@/lib/auth";
 import { decrypt, encrypt } from "@/lib/crypto";
 import { db } from "@/db";
@@ -11,6 +15,7 @@ import {
 import { and, eq, sql } from "drizzle-orm";
 import { User } from "@/types/user";
 
+// Get a token for a user (including collagborators who need to provide an owner/repo scope).
 const getToken = cache(async (user: User, owner: string, repo: string) => {
   if (user.githubId) return await getUserToken();
 
@@ -27,6 +32,7 @@ const getToken = cache(async (user: User, owner: string, repo: string) => {
   return installationToken
 });
 
+// Get the GitHub App installation token for a specific repository.
 const getInstallationToken = cache(async (owner: string, repo: string) => {
   const app = new App({
 		appId: process.env.GITHUB_APP_ID!,
@@ -75,6 +81,7 @@ const getInstallationToken = cache(async (owner: string, repo: string) => {
   return installationToken.data.token;
 });
 
+// Get the GitHub user token.
 const getUserToken = cache(async () => {
   const { user } = await getAuth();
 	if (!user) throw new Error("User not found");
diff --git a/lib/utils/accounts.ts b/lib/utils/accounts.ts
index e0718523..82d8c507 100644
--- a/lib/utils/accounts.ts
+++ b/lib/utils/accounts.ts
@@ -1,3 +1,7 @@
+/**
+ * Get the list of GitHub accounts the user (incl. collaborators) has access to.
+ */
+
 import { db } from "@/db";
 import { collaboratorTable } from "@/db/schema";
 import { eq } from "drizzle-orm";
diff --git a/lib/utils/avatar.ts b/lib/utils/avatar.ts
index dcaba757..3c9ddacf 100644
--- a/lib/utils/avatar.ts
+++ b/lib/utils/avatar.ts
@@ -1,3 +1,7 @@
+/**
+ * Helper function to get the name initials for a user avatar.
+ */
+
 const getInitialsFromName = (name?: string) => {
   if (!name) return 'U';
 
diff --git a/lib/utils/config.ts b/lib/utils/config.ts
index fc379654..cc1c9a92 100644
--- a/lib/utils/config.ts
+++ b/lib/utils/config.ts
@@ -1,3 +1,11 @@
+/**
+ * Utility functions to create, retrieve and update a repository configuration
+ * from the DB.
+ * 
+ * Look at the `lib/config.ts` file to understand how the config is parsed,
+ * normalized and validated.
+ */
+
 import { cache } from "react";
 import { Config } from "@/types/config";
 import { db } from "@/db";
diff --git a/lib/utils/file.ts b/lib/utils/file.ts
index e7bd23f6..26e25e6f 100644
--- a/lib/utils/file.ts
+++ b/lib/utils/file.ts
@@ -1,3 +1,7 @@
+/**
+ * Define file types and provide Helper functions (get file info, get parent path, normalize paths...)
+ */
+
 const serializedTypes = ["yaml-frontmatter", "json-frontmatter", "toml-frontmatter", "yaml", "json", "toml"];
 
 const extensionCategories: Record<string, string[]> = {
@@ -5,7 +9,10 @@ const extensionCategories: Record<string, string[]> = {
   document: ["pdf", "doc", "docx", "ppt", "pptx", "vxls", "xlsx", "txt", "rtf"],
   video: ["mp4", "avi", "mov", "wmv", "flv", "mpeg", "webm", "ogv", "ts", "3gp", "3g2"],
   audio: ["mp3", "wav", "aac", "ogg", "flac", "weba", "oga", "opus", "mid", "midi", "3gp", "3g2"],
-  compressed: ["zip", "rar", "7z", "tar", "gz", "tgz", "bz", "bz2"]
+  compressed: ["zip", "rar", "7z", "tar", "gz", "tgz", "bz", "bz2"],
+  code: ["js", "jsx", "ts", "tsx", "html", "css", "scss", "json", "xml", "yaml", "yml", "md", "py", "rb", "php", "java", "c", "cpp", "h", "cs", "go", "rs", "sql"],
+  font: ["ttf", "otf", "woff", "woff2", "eot"],
+  spreadsheet: ["csv", "tsv", "ods"]
 };
 
 const getFileSize = (
diff --git a/lib/utils/octokit.ts b/lib/utils/octokit.ts
index 5d264771..fca87118 100644
--- a/lib/utils/octokit.ts
+++ b/lib/utils/octokit.ts
@@ -1,3 +1,8 @@
+/**
+ * Create an Octokit instance that wraps the requests with a check for credentials
+ * to log out the user if they revoked/lost access.
+ */
+
 import { Octokit } from "octokit";
 import { handleSignOut } from "@/lib/actions/auth";
 
diff --git a/lib/utils/templates.ts b/lib/utils/templates.ts
index 8aec43fd..366de27d 100644
--- a/lib/utils/templates.ts
+++ b/lib/utils/templates.ts
@@ -1,3 +1,7 @@
+/**
+ * List of GitHub repository templates the user can copy.
+ */
+
 const templates = [
   // {
   //   name: "Blank",

From 13605fbba19823d3fcd70c79758240e04a873672 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 15 Mar 2025 20:13:29 +0800
Subject: [PATCH 34/95] First version of the file field

---
 .../[repo]/[branch]/files/[path]/route.ts     |  90 +++++---
 components/entry/entry-form.tsx               |   4 +
 fields/core/file/edit-component.tsx           | 205 ++++++++++++++++++
 fields/core/file/index.tsx                    |  48 ++++
 fields/core/file/view-component.tsx           |  36 +++
 5 files changed, 350 insertions(+), 33 deletions(-)
 create mode 100644 fields/core/file/edit-component.tsx
 create mode 100644 fields/core/file/index.tsx
 create mode 100644 fields/core/file/view-component.tsx

diff --git a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
index 78233939..9284da92 100644
--- a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
@@ -5,7 +5,7 @@ import { configVersion, parseConfig, normalizeConfig } from "@/lib/config";
 import { stringify } from "@/lib/serialization";
 import { deepMap, getDefaultValue, generateZodSchema, getSchemaByName, sanitizeObject } from "@/lib/schema";
 import { getConfig, updateConfig } from "@/lib/utils/config";
-import { getFileExtension, getFileName, normalizePath, serializedTypes } from "@/lib/utils/file";
+import { getFileExtension, getFileName, normalizePath, serializedTypes, getParentPath } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
 import { updateFileCache } from "@/lib/githubCache";
@@ -203,47 +203,71 @@ const githubSaveFile = async (
   contentBase64: string,
   sha?: string,
 ) => {
-  const generateUniqueFilename = (path: string, attempt: number) => {
-    const [filename, extension] = path.split(".");
-    const baseName = `${filename}-${attempt}`;
-    return `${baseName}.${extension}`;
-  };
-
-  let currentPath = path;
-  let attempts = 0;
-  const maxAttempts = sha ? 1 : 5;
-  let uniqueFilenameCounter = 1;
-
   const octokit = createOctokitInstance(token);
 
-  while (attempts < maxAttempts) {
-    try {
-      const response = await octokit.rest.repos.createOrUpdateFileContents({
+  try {
+    // First attempt - try with original path
+    const response = await octokit.rest.repos.createOrUpdateFileContents({
+      owner,
+      repo,
+      path,
+      message: sha ? `Update ${path} (via Pages CMS)` : `Create ${path} (via Pages CMS)`,
+      content: contentBase64,
+      branch,
+      sha: sha || undefined,
+    });
+
+    if (response.data.content && response.data.commit) {
+      return response;
+    }
+    throw new Error("Invalid response structure");
+  } catch (error: any) {
+    // Only handle 422 errors for new files (no sha)
+    if (error.status === 422 && !sha) {
+      // Get directory contents to find next available name
+      const parentDir = getParentPath(path);
+      const { data } = await octokit.rest.repos.getContent({
         owner,
         repo,
-        path: currentPath,
-        message: sha
-          ? `Update ${currentPath} (via Pages CMS)`
-          : `Create ${currentPath} (via Pages CMS)`,
-        content: contentBase64,
-        branch,
-        sha: sha || undefined,
+        path: parentDir || '.',
+        ref: branch,
       });
 
-      if (response.data.content && response.data.commit) {
-        return response;
-      } else {
-        throw new Error("Invalid response structure");
+      if (!Array.isArray(data)) {
+        throw new Error('Expected directory listing');
       }
-    } catch (error: any) {
-      if (error.status === 422 && maxAttempts && maxAttempts > 1) {
-        attempts++;
-        currentPath = generateUniqueFilename(path, uniqueFilenameCounter);
-        uniqueFilenameCounter++;
-      } else {
-        throw error;
+
+      const [filename, extension] = path.split('/').pop()!.split('.');
+      const pattern = new RegExp(`^${filename}-(\\d+)\\.${extension}$`);
+      const maxNumber = Math.max(0, ...data
+        .map(file => {
+          const match = file.name.match(pattern);
+          return match ? parseInt(match[1], 10) : 0;
+        }));
+
+      // Try up to 3 times with incrementing numbers
+      for (let i = 1; i <= 3; i++) {
+        const newPath = `${parentDir ? parentDir + '/' : ''}${filename}-${maxNumber + i}.${extension}`;
+        try {
+          const response = await octokit.rest.repos.createOrUpdateFileContents({
+            owner,
+            repo,
+            path: newPath,
+            message: `Create ${newPath} (via Pages CMS)`,
+            content: contentBase64,
+            branch,
+          });
+
+          if (response.data.content && response.data.commit) {
+            return response;
+          }
+        } catch (error: any) {
+          if (i === 3 || error.status !== 422) throw error;
+          // Continue to next attempt if 422
+        }
       }
     }
+    throw error;
   }
 };
 
diff --git a/components/entry/entry-form.tsx b/components/entry/entry-form.tsx
index c1f6a9aa..10346598 100644
--- a/components/entry/entry-form.tsx
+++ b/components/entry/entry-form.tsx
@@ -320,6 +320,9 @@ const EntryForm = ({
   };
 
   return (
+    <>
+    {/* WE display the state of the form's values */}
+    <pre>{JSON.stringify(form.watch(), null, 2)}</pre>
     <Form {...form}>
       <form onSubmit={form.handleSubmit(handleSubmit)}>
         <div className="max-w-screen-xl mx-auto flex w-full gap-x-8">
@@ -364,6 +367,7 @@ const EntryForm = ({
         </div>
       </form>
     </Form>
+    </>
   );
 };
 
diff --git a/fields/core/file/edit-component.tsx b/fields/core/file/edit-component.tsx
new file mode 100644
index 00000000..7cd4aada
--- /dev/null
+++ b/fields/core/file/edit-component.tsx
@@ -0,0 +1,205 @@
+"use client";
+
+import { forwardRef, useCallback, useState, useEffect } from "react";
+import { Button } from "@/components/ui/button";
+import { MediaUpload } from "@/components/media/media-upload";
+import { Pencil, Trash2, Upload, File, FileText, FileVideo, FileImage, FileAudio, FileArchive, FileCode, FileType, FileSpreadsheet, GripVertical } from "lucide-react";
+import { useConfig } from "@/contexts/config-context";
+import { getFileExtension, getFileName, extensionCategories } from "@/lib/utils/file";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
+import { arrayMove, SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy } from '@dnd-kit/sortable';
+import { useSortable } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+
+const SortableItem = ({ file, onRemove, getFileIcon }: { 
+  file: string;
+  onRemove: (file: string) => void;
+  getFileIcon: (file: string) => React.ReactNode;
+}) => {
+  const {
+    attributes,
+    listeners,
+    setNodeRef,
+    transform,
+    transition,
+    isDragging
+  } = useSortable({ id: file });
+
+  const style = {
+    transform: CSS.Transform.toString(transform),
+    transition,
+    opacity: isDragging ? 0.5 : 1,
+    zIndex: isDragging ? 1 : 0,
+    position: 'relative' as const
+  };
+
+  return (
+    <div ref={setNodeRef} style={style}>
+      <div className="grid grid-cols-[auto_auto_1fr_auto] items-center gap-2 px-4 py-2 border rounded-md bg-background">
+        <div {...attributes} {...listeners} className="-ml-2">
+          <GripVertical className="h-4 w-4 text-muted-foreground cursor-grab" />
+        </div>
+        {getFileIcon(file)}
+        <div className="overflow-hidden">
+          <div className="font-medium truncate">{getFileName(file)}</div>
+          <div className="text-xs text-muted-foreground truncate">{file}</div>
+        </div>
+
+        <div>
+          <TooltipProvider>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="sm"
+                  onClick={() => onRemove(file)}
+                  className="h-8 w-8 p-0"
+                >
+                  <Trash2 className="h-4 w-4" />
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent>
+                Remove
+              </TooltipContent>
+            </Tooltip>
+          </TooltipProvider>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>) => {
+  const { value, field, onChange } = props;
+  const { config } = useConfig();
+
+  const [files, setFiles] = useState<string[]>(() => 
+    value
+      ? Array.isArray(value)
+        ? value
+        : [value]
+      : []
+  );
+
+  const isMultiple = field.options?.multiple !== undefined && field.options?.multiple !== false;
+  const uploadPath = field.options?.path || config?.object.media?.input;
+
+  useEffect(() => {
+    if (isMultiple) {
+      onChange(files);
+    } else {
+      onChange(files[0] || undefined);
+    }
+  }, [files, isMultiple, onChange]);
+
+  const handleUpload = useCallback((fileData: any) => {
+    if (!config) return;
+    
+    const path = fileData.path;
+    
+    if (isMultiple) {
+      setFiles(prev => [...prev, path]);
+    } else {
+      setFiles([path]);
+    }
+  }, [isMultiple, config]);
+
+  const handleRemove = useCallback((pathToRemove: string) => {
+    console.log("handleRemove", pathToRemove);
+    setFiles(prev => prev.filter(path => path !== pathToRemove));
+  }, []);
+
+  const getFileIcon = (filePath: string) => {
+    const ext = getFileExtension(filePath);
+    for (const [category, extensions] of Object.entries(extensionCategories)) {
+      if (extensions.includes(ext)) {
+        switch (category) {
+          case 'image':
+            return <FileImage className="h-10 w-10 stroke-[1]" />;
+          case 'document':
+            return <FileText className="h-10 w-10 stroke-[1]" />;
+          case 'video':
+            return <FileVideo className="h-10 w-10 stroke-[1]" />;
+          case 'audio':
+            return <FileAudio className="h-10 w-10 stroke-[1]" />;
+          case 'compressed':
+            return <FileArchive className="h-10 w-10 stroke-[1]" />;
+          case 'code':
+            return <FileCode className="h-10 w-10 stroke-[1]" />;
+          case 'font':
+            return <FileType className="h-10 w-10 stroke-[1]" />;
+          case 'spreadsheet':
+            return <FileSpreadsheet className="h-10 w-10 stroke-[1]" />;
+          default:
+            return <FileText className="h-10 w-10 stroke-[1]" />;
+        }
+      }
+    }
+    return <File className="h-10 w-10 stroke-[1]" />;
+  };
+
+  const sensors = useSensors(
+    useSensor(PointerSensor),
+    useSensor(KeyboardSensor, {
+      coordinateGetter: sortableKeyboardCoordinates,
+    })
+  );
+
+  const handleDragEnd = (event: any) => {
+    const { active, over } = event;
+
+    if (active.id !== over.id) {
+      setFiles((items) => {
+        const oldIndex = items.indexOf(active.id);
+        const newIndex = items.indexOf(over.id);
+        return arrayMove(items, oldIndex, newIndex);
+      });
+    }
+  };
+
+  return (
+    <div className="space-y-2">
+      <div className="space-y-2">
+        <DndContext 
+          sensors={sensors}
+          collisionDetection={closestCenter}
+          onDragEnd={handleDragEnd}
+        >
+          <SortableContext 
+            items={files}
+            strategy={verticalListSortingStrategy}
+          >
+            {files.map((file) => (
+              <SortableItem 
+                key={file} 
+                file={file} 
+                onRemove={handleRemove}
+                getFileIcon={getFileIcon}
+              />
+            ))}
+          </SortableContext>
+        </DndContext>
+      </div>
+      
+      {(!files.length || isMultiple) && (
+        <MediaUpload path={uploadPath} onUpload={handleUpload}>
+          <Button type="button" size="sm" className="gap-2">
+            <Upload className="h-3.5 w-3.5"/>
+            Upload
+          </Button>
+        </MediaUpload>
+      )}
+    </div>
+  );
+});
+
+EditComponent.displayName = "EditComponent";
+
+export { EditComponent };
\ No newline at end of file
diff --git a/fields/core/file/index.tsx b/fields/core/file/index.tsx
new file mode 100644
index 00000000..581a0d2c
--- /dev/null
+++ b/fields/core/file/index.tsx
@@ -0,0 +1,48 @@
+import { z } from "zod";
+import { ViewComponent } from "./view-component";
+import { EditComponent } from "./edit-component";
+import { Field } from "@/types/field";
+import { swapPrefix } from "@/lib/githubImage";
+
+const read = (value: any, field: Field, config: Record<string, any>): string | string[] | null => {
+  if (!value) return null;
+  if (Array.isArray(value) && !value.length) return null;
+  
+  const prefixInput = field.options?.input ?? config.object.media?.input;
+  const prefixOutput = field.options?.output ?? config.object.media?.output;
+
+  if (Array.isArray(value)) {
+    return value.map(v => read(v, field, config)) as string[];
+  }
+
+  return swapPrefix(value, prefixOutput, prefixInput, true);
+};
+
+const write = (value: any, field: Field, config: Record<string, any>): string | string[] | null => {
+  if (!value) return null;
+  if (Array.isArray(value) && !value.length) return null;
+
+  const prefixInput = field.options?.input ?? config.object.media?.input;
+  const prefixOutput = field.options?.output ?? config.object.media?.output;
+
+  if (Array.isArray(value)) {
+    return value.map(v => write(v, field, config)) as string[];
+  }
+
+  return swapPrefix(value, prefixInput, prefixOutput);
+};
+
+const schema = (field: Field) => {
+  let zodSchema: z.ZodTypeAny = z.coerce.string();
+
+  if (field.options?.multiple) zodSchema = z.array(zodSchema);
+  
+  if (!field.required) zodSchema = zodSchema.optional();
+  
+  return zodSchema;
+};
+
+
+const supportsList = true;
+
+export { schema, ViewComponent, EditComponent, read, write, supportsList };
\ No newline at end of file
diff --git a/fields/core/file/view-component.tsx b/fields/core/file/view-component.tsx
new file mode 100644
index 00000000..0ac55249
--- /dev/null
+++ b/fields/core/file/view-component.tsx
@@ -0,0 +1,36 @@
+"use client";
+
+import { useMemo } from "react";
+import { Thumbnail } from "@/components/thumbnail";
+import { Field } from "@/types/field";
+
+const ViewComponent = ({
+  value,
+  field
+}: {
+  value: string;
+  field: Field;
+}) => {
+  const extraValuesCount = value && Array.isArray(value) ? value.length - 1 : 0;
+
+  const path = useMemo(() => {
+    return !value
+      ? null
+      : Array.isArray(value)
+        ? value[0]
+        : value;
+  }, [value]);
+
+  return (
+    <span className="flex items-center gap-x-1.5">
+      <Thumbnail path={path} className="w-8 rounded-md"/>
+      {extraValuesCount > 0 && (
+        <span className="text-muted-foreground text-xs">
+          +{extraValuesCount}
+        </span>
+      )}
+    </span>
+  );
+}
+
+export { ViewComponent };
\ No newline at end of file

From bb4a7b1539569f108e5117c60c1fcfa981e556d5 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 15 Mar 2025 20:14:22 +0800
Subject: [PATCH 35/95] Removing unused RHF helpers

---
 lib/schema.ts | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/lib/schema.ts b/lib/schema.ts
index 279c393f..7049197e 100644
--- a/lib/schema.ts
+++ b/lib/schema.ts
@@ -82,42 +82,6 @@ const getDefaultValue = (field: Record<string, any>) => {
   }
 };
 
-// Used to work around RHF's inability to handle flat field arrays
-// See https://react-hook-form.com/docs/usefieldarray#rules
-const nestFieldArrays = (values: any, fields: Field[]): any => {
-  const result: any = {};
-
-  fields.forEach(field => {
-    if (field.list) {
-      result[field.name] = values[field.name]?.map((item: any) => field.type === 'object' ? { value: nestFieldArrays(item, field.fields || []) } : { value: item }) || [];
-    } else if (field.type === "object" && field.fields) {
-      result[field.name] = nestFieldArrays(values[field.name] || {}, field.fields);
-    } else {
-      result[field.name] = values[field.name];
-    }
-  });
-
-  return result;
-};
-
-// Used to work around RHF's inability to handle flat field arrays
-// See https://react-hook-form.com/docs/usefieldarray#rules
-const unnestFieldArrays = (values: any, fields: Field[]): any => {
-  const result: any = {};
-
-  fields.forEach(field => {
-    if (field.list) {
-      result[field.name] = values[field.name]?.map((item: { value: any }) => field.type === 'object' ? unnestFieldArrays(item.value, field.fields || []) : item.value) || [];
-    } else if (field.type === "object" && field.fields) {
-      result[field.name] = unnestFieldArrays(values[field.name] || {}, field.fields);
-    } else {
-      result[field.name] = values[field.name];
-    }
-  });
-
-  return result;
-};
-
 // Generate a Zod schema for validation
 // nestArrays allows us to nest arrays to work around RHF's inability to handle flat field arrays
 // See https://react-hook-form.com/docs/usefieldarray#rules

From f9f92d0cb5f66b2f0102fa491089196022800a19 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 15 Mar 2025 20:14:54 +0800
Subject: [PATCH 36/95] Removing unused RHF helpers

---
 lib/schema.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/schema.ts b/lib/schema.ts
index 7049197e..84f5f135 100644
--- a/lib/schema.ts
+++ b/lib/schema.ts
@@ -292,8 +292,6 @@ export {
   getPrimaryField,
   generateFilename,
   getDateFromFilename,
-  nestFieldArrays,
-  unnestFieldArrays,
   generateZodSchema,
   safeAccess,
   interpolate

From 350b242d537fc8eedd264817972f32897394fc8a Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sun, 16 Mar 2025 19:30:11 +0800
Subject: [PATCH 37/95] Adding support for multiple media

---
 .../[owner]/[repo]/[branch]/media/page.tsx    |   1 -
 .../[repo]/[branch]/media/[path]/route.ts     |  18 ++-
 components/entry/entry-form.tsx               |   4 -
 components/media/media-dialog.tsx             |   2 +-
 components/media/media-view.tsx               |  33 ++--
 components/repo/repo-nav.tsx                  |  34 ++---
 fields/core/file/edit-component.tsx           | 142 ++++++++++++------
 fields/core/uuid/edit-component.tsx           |   3 +-
 lib/config.ts                                 |  50 +++---
 lib/configSchema.ts                           |  71 +++++----
 lib/schema.ts                                 |   2 +-
 11 files changed, 226 insertions(+), 134 deletions(-)

diff --git a/app/(main)/[owner]/[repo]/[branch]/media/page.tsx b/app/(main)/[owner]/[repo]/[branch]/media/page.tsx
index 917f5f08..135c81e5 100644
--- a/app/(main)/[owner]/[repo]/[branch]/media/page.tsx
+++ b/app/(main)/[owner]/[repo]/[branch]/media/page.tsx
@@ -3,7 +3,6 @@
 import { useSearchParams } from "next/navigation";
 import { useConfig } from "@/contexts/config-context";
 import { MediaView} from "@/components/media/media-view";
-import { Message } from "@/components/message";
 
 export default function Page() {
   const searchParams = useSearchParams();
diff --git a/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts
index 881e3e9a..6493b262 100644
--- a/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts
@@ -28,10 +28,20 @@ export async function GET(
     const config = await getConfig(params.owner, params.repo, params.branch);
     if (!config) throw new Error(`Configuration not found for ${params.owner}/${params.repo}/${params.branch}.`);   
     
-    if (!config.object.media) throw new Error(`No media configuration found for ${params.owner}/${params.repo}/${params.branch}.`);
+    const { searchParams } = new URL(request.url);
+    const mediaConfigName = searchParams.get('name');
+    
+    const mediaConfig = mediaConfigName
+      ? config.object.media.find((item: any) => item.name === mediaConfigName)
+      : config.object.media[0];
+
+    if (!mediaConfig) {
+      if (mediaConfigName) throw new Error(`No media configuration named "${mediaConfigName}" found for ${params.owner}/${params.repo}/${params.branch}.`);
+      throw new Error(`No media configuration found for ${params.owner}/${params.repo}/${params.branch}.`);
+    }
 
     const normalizedPath = normalizePath(params.path);
-    if (!normalizedPath.startsWith(config.object.media.input)) throw new Error(`Invalid path "${params.path}" for media.`);
+    if (!normalizedPath.startsWith(mediaConfig.input)) throw new Error(`Invalid path "${params.path}" for media.`);
 
     const octokit = createOctokitInstance(token);
     const response = await octokit.rest.repos.getContent({
@@ -47,11 +57,11 @@ export async function GET(
 
     let results = response.data;
 
-    if (config.object.media.extensions && config.object.media.extensions.length > 0) {
+    if (mediaConfig.extensions && mediaConfig.extensions.length > 0) {
       results = response.data.filter((item) => {
         if (item.type === "dir") return true;
         const extension = getFileExtension(item.name);
-        return config.object.media.extensions.includes(extension);
+        return mediaConfig.extensions.includes(extension);
       });
     }
 
diff --git a/components/entry/entry-form.tsx b/components/entry/entry-form.tsx
index 10346598..c1f6a9aa 100644
--- a/components/entry/entry-form.tsx
+++ b/components/entry/entry-form.tsx
@@ -320,9 +320,6 @@ const EntryForm = ({
   };
 
   return (
-    <>
-    {/* WE display the state of the form's values */}
-    <pre>{JSON.stringify(form.watch(), null, 2)}</pre>
     <Form {...form}>
       <form onSubmit={form.handleSubmit(handleSubmit)}>
         <div className="max-w-screen-xl mx-auto flex w-full gap-x-8">
@@ -367,7 +364,6 @@ const EntryForm = ({
         </div>
       </form>
     </Form>
-    </>
   );
 };
 
diff --git a/components/media/media-dialog.tsx b/components/media/media-dialog.tsx
index d698e5b2..c793388e 100644
--- a/components/media/media-dialog.tsx
+++ b/components/media/media-dialog.tsx
@@ -27,8 +27,8 @@ const MediaDialog = forwardRef(({
   initialPath,
   children
 }: {
-  selected: string[],
   onSubmit: (images: string[]) => void,
+  selected?: string[],
   maxSelected?: number,
   initialPath?: string,
   children?: React.ReactNode
diff --git a/components/media/media-view.tsx b/components/media/media-view.tsx
index a72f05f2..a43e6c7d 100644
--- a/components/media/media-view.tsx
+++ b/components/media/media-view.tsx
@@ -32,11 +32,13 @@ import {
 } from "lucide-react";
 
 const MediaView = ({
+  name,
   initialPath,
   initialSelected,
   maxSelected,
   onSelect,
 }: {
+  name?: string,
   initialPath?: string,
   initialSelected?: string[],
   maxSelected?: number,
@@ -45,6 +47,11 @@ const MediaView = ({
   const { config } = useConfig();
   if (!config) throw new Error(`Configuration not found.`);
 
+  const mediaConfig = useMemo(() => {
+    if (!name) return config.object.media[0];
+    return config.object.media.find((item: any) => item.name === name);
+  }, [name, config.object.media]);
+
   const searchParams = useSearchParams();
   const pathname = usePathname();
   const router = useRouter();
@@ -54,12 +61,12 @@ const MediaView = ({
   const [error, setError] = useState<string | null | undefined>(null);
   const [selected, setSelected] = useState(initialSelected || []);
   const [path, setPath] = useState(() => {
-    if (!config.object.media) return "";
-    if (!initialPath) return config.object.media.input;
+    if (!mediaConfig) return "";
+    if (!initialPath) return mediaConfig.input;
     const normalizedInitialPath = normalizePath(initialPath);
-    if (normalizedInitialPath.startsWith(config.object.media.input)) return normalizedInitialPath;
-    console.warn(`"${initialPath}" is not within media root "${config.object.media.input}". Defaulting to media root.`);
-    return config.object.media.input;
+    if (normalizedInitialPath.startsWith(mediaConfig.input)) return normalizedInitialPath;
+    console.warn(`"${initialPath}" is not within media root "${mediaConfig.input}". Defaulting to media root.`);
+    return mediaConfig.input;
   });
   const [data, setData] = useState<Record<string, any>[] | undefined>(undefined);
   const [isLoading, setIsLoading] = useState(true);
@@ -135,13 +142,13 @@ const MediaView = ({
     setPath(newPath);
     if (!onSelect) {
       const params = new URLSearchParams(Array.from(searchParams.entries()));
-      params.set("path", newPath || config?.object.media.input);
+      params.set("path", newPath || mediaConfig.input);
       router.push(`${pathname}?${params.toString()}`);
     }
   }
 
   const handleNavigateParent = () => {
-    if (!path || path === config.object.media.input) return;
+    if (!path || path === mediaConfig.input) return;
     handleNavigate(getParentPath(path));
   }
 
@@ -194,7 +201,7 @@ const MediaView = ({
     </ul>
   ), []);
 
-  if (!config.object.media?.input) {
+  if (!mediaConfig.input) {
     return (
       <Message
         title="No media defined"
@@ -208,11 +215,11 @@ const MediaView = ({
 
   if (error) {
     // TODO: should we use a custom error class with code?
-    if (path === config.object.media.input && error === "Not found") {
+    if (path === mediaConfig.input && error === "Not found") {
       return (
         <Message
             title="Media folder missing"
-            description={`The media folder "${config.object.media.input}" has not been created yet.`}
+            description={`The media folder "${mediaConfig.input}" has not been created yet.`}
             className="absolute inset-0"
           >
           <EmptyCreate type="media">Create folder</EmptyCreate>
@@ -225,7 +232,7 @@ const MediaView = ({
           description={error}
           className="absolute inset-0"
         >
-          <Button size="sm" onClick={() => handleNavigate(config.object.media.input)}>Go to media root</Button>
+          <Button size="sm" onClick={() => handleNavigate(mediaConfig.input)}>Go to media root</Button>
         </Message>
       );
     }
@@ -235,8 +242,8 @@ const MediaView = ({
     <div className="flex-1 flex flex-col space-y-4">
       <header className="flex items-center gap-x-2">
         <div className="sm:flex-1">
-          <PathBreadcrumb path={path} rootPath={config.object.media.input} handleNavigate={handleNavigate} className="hidden sm:block"/>
-          <Button onClick={handleNavigateParent} size="icon-sm" variant="outline" className="shrink-0 sm:hidden" disabled={!path || path === config.object.media.input}>
+          <PathBreadcrumb path={path} rootPath={mediaConfig.input} handleNavigate={handleNavigate} className="hidden sm:block"/>
+          <Button onClick={handleNavigateParent} size="icon-sm" variant="outline" className="shrink-0 sm:hidden" disabled={!path || path === mediaConfig.input}>
             <CornerLeftUp className="w-4 h-4"/>
           </Button>
         </div>
diff --git a/components/repo/repo-nav.tsx b/components/repo/repo-nav.tsx
index 6486ed84..8cd9801c 100644
--- a/components/repo/repo-nav.tsx
+++ b/components/repo/repo-nav.tsx
@@ -6,7 +6,7 @@ import { usePathname } from "next/navigation";
 import { useConfig } from "@/contexts/config-context";
 import { useUser } from "@/contexts/user-context";
 import { cn } from "@/lib/utils";
-import { FileStack, FileText, Image as ImageIcon, Settings, Users } from "lucide-react";
+import { FileStack, FileText, FolderOpen, Settings, Users } from "lucide-react";
 
 const RepoNavItem = ({
   children,
@@ -56,31 +56,31 @@ const RepoNav = ({
       label: item.label || item.name,
     })) || [];
 
-    const mediaItem = configObject.media?.input && configObject.media?.output
+    const mediaItem = configObject.media
       ? {
-          key: "media",
-          icon: <ImageIcon className="h-5 w-5 mr-2" />,
-          href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media`,
-          label: "Media"
-        }
+        key: "media",
+        icon: <FolderOpen className="h-5 w-5 mr-2" />,
+        href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media`,
+        label: "Media"
+      }
       : null;
 
     const settingsItem = configObject.settings !== false
       ? {
-          key: "settings",
-          icon: <Settings className="h-5 w-5 mr-2" />,
-          href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/settings`,
-          label: "Settings"
-        }
+        key: "settings",
+        icon: <Settings className="h-5 w-5 mr-2" />,
+        href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/settings`,
+        label: "Settings"
+      }
       : null;
 
     const collaboratorsItem = configObject && Object.keys(configObject).length !== 0 && user?.githubId
       ? {
-          key: "collaborators",
-          icon: <Users className="h-5 w-5 mr-2" />,
-          href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collaborators`,
-          label: "Collaborators"
-        }
+        key: "collaborators",
+        icon: <Users className="h-5 w-5 mr-2" />,
+        href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collaborators`,
+        label: "Collaborators"
+      }
       : null;
 
     return [
diff --git a/fields/core/file/edit-component.tsx b/fields/core/file/edit-component.tsx
index 7cd4aada..4fa46150 100644
--- a/fields/core/file/edit-component.tsx
+++ b/fields/core/file/edit-component.tsx
@@ -3,9 +3,10 @@
 import { forwardRef, useCallback, useState, useEffect } from "react";
 import { Button } from "@/components/ui/button";
 import { MediaUpload } from "@/components/media/media-upload";
-import { Pencil, Trash2, Upload, File, FileText, FileVideo, FileImage, FileAudio, FileArchive, FileCode, FileType, FileSpreadsheet, GripVertical } from "lucide-react";
+import { MediaDialog } from "@/components/media/media-dialog";
+import { Trash2, Upload, File, FileText, FileVideo, FileImage, FileAudio, FileArchive, FileCode, FileType, FileSpreadsheet, GripVertical, Folder, FolderOpen } from "lucide-react";
 import { useConfig } from "@/contexts/config-context";
-import { getFileExtension, getFileName, extensionCategories } from "@/lib/utils/file";
+import { getFileExtension, getFileName, extensionCategories, getParentPath } from "@/lib/utils/file";
 import {
   Tooltip,
   TooltipContent,
@@ -16,8 +17,12 @@ import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, us
 import { arrayMove, SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
+import { v4 as uuidv4 } from 'uuid';
 
-const SortableItem = ({ file, onRemove, getFileIcon }: { 
+const generateId = () => uuidv4().slice(0, 8);
+
+const SortableItem = ({ id, file, onRemove, getFileIcon }: { 
+  id: string;
   file: string;
   onRemove: (file: string) => void;
   getFileIcon: (file: string) => React.ReactNode;
@@ -29,7 +34,7 @@ const SortableItem = ({ file, onRemove, getFileIcon }: {
     transform,
     transition,
     isDragging
-  } = useSortable({ id: file });
+  } = useSortable({ id: id });
 
   const style = {
     transform: CSS.Transform.toString(transform),
@@ -41,14 +46,17 @@ const SortableItem = ({ file, onRemove, getFileIcon }: {
 
   return (
     <div ref={setNodeRef} style={style}>
-      <div className="grid grid-cols-[auto_auto_1fr_auto] items-center gap-2 px-4 py-2 border rounded-md bg-background">
-        <div {...attributes} {...listeners} className="-ml-2">
-          <GripVertical className="h-4 w-4 text-muted-foreground cursor-grab" />
+      <div className="grid grid-cols-[auto_1fr_auto] items-center gap-2 pl-2 pr-1 bg-muted rounded-md h-10">
+        <div
+          {...attributes} {...listeners}
+          className="text-muted-foreground hover:text-foreground cursor-grab transition-colors"
+        >
+          <GripVertical className="h-4 w-4" />
         </div>
-        {getFileIcon(file)}
-        <div className="overflow-hidden">
-          <div className="font-medium truncate">{getFileName(file)}</div>
-          <div className="text-xs text-muted-foreground truncate">{file}</div>
+        <div className="flex items-center overflow-hidden">
+          {getFileIcon(file)}
+          <span className="ml-1 font-medium whitespace-nowrap">{getFileName(file)}</span>
+          <span className="ml-2 text-muted-foreground truncate">{file}</span>
         </div>
 
         <div>
@@ -80,40 +88,44 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
   const { value, field, onChange } = props;
   const { config } = useConfig();
 
-  const [files, setFiles] = useState<string[]>(() => 
+  const [files, setFiles] = useState<Array<{ id: string, path: string }>>(() => 
     value
       ? Array.isArray(value)
-        ? value
-        : [value]
+        ? value.map(path => ({ id: generateId(), path }))
+        : [{ id: generateId(), path: value }]
       : []
   );
 
   const isMultiple = field.options?.multiple !== undefined && field.options?.multiple !== false;
-  const uploadPath = field.options?.path || config?.object.media?.input;
+  const rootPath = field.options?.path || field.options?.input || config?.object.media?.input;
+  const remainingSlots = field.options?.multiple
+    ? field.options.multiple.max
+      ? field.options.multiple.max - files.length
+      : Infinity
+    : 1 - files.length;
 
   useEffect(() => {
     if (isMultiple) {
-      onChange(files);
+      onChange(files.map(f => f.path));
     } else {
-      onChange(files[0] || undefined);
+      onChange(files[0]?.path || undefined);
     }
   }, [files, isMultiple, onChange]);
 
   const handleUpload = useCallback((fileData: any) => {
     if (!config) return;
     
-    const path = fileData.path;
+    const newFile = { id: generateId(), path: fileData.path };
     
     if (isMultiple) {
-      setFiles(prev => [...prev, path]);
+      setFiles(prev => [...prev, newFile]);
     } else {
-      setFiles([path]);
+      setFiles([newFile]);
     }
   }, [isMultiple, config]);
 
-  const handleRemove = useCallback((pathToRemove: string) => {
-    console.log("handleRemove", pathToRemove);
-    setFiles(prev => prev.filter(path => path !== pathToRemove));
+  const handleRemove = useCallback((fileId: string) => {
+    setFiles(prev => prev.filter(file => file.id !== fileId));
   }, []);
 
   const getFileIcon = (filePath: string) => {
@@ -122,27 +134,27 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
       if (extensions.includes(ext)) {
         switch (category) {
           case 'image':
-            return <FileImage className="h-10 w-10 stroke-[1]" />;
+            return <FileImage className="h-4 w-4" />;
           case 'document':
-            return <FileText className="h-10 w-10 stroke-[1]" />;
+            return <FileText className="h-4 w-4" />;
           case 'video':
-            return <FileVideo className="h-10 w-10 stroke-[1]" />;
+            return <FileVideo className="h-4 w-4" />;
           case 'audio':
-            return <FileAudio className="h-10 w-10 stroke-[1]" />;
+            return <FileAudio className="h-4 w-4" />;
           case 'compressed':
-            return <FileArchive className="h-10 w-10 stroke-[1]" />;
+            return <FileArchive className="h-4 w-4" />;
           case 'code':
-            return <FileCode className="h-10 w-10 stroke-[1]" />;
+            return <FileCode className="h-4 w-4" />;
           case 'font':
-            return <FileType className="h-10 w-10 stroke-[1]" />;
+            return <FileType className="h-4 w-4" />;
           case 'spreadsheet':
-            return <FileSpreadsheet className="h-10 w-10 stroke-[1]" />;
+            return <FileSpreadsheet className="h-4 w-4" />;
           default:
-            return <FileText className="h-10 w-10 stroke-[1]" />;
+            return <FileText className="h-4 w-4" />;
         }
       }
     }
-    return <File className="h-10 w-10 stroke-[1]" />;
+    return <File className="h-4 w-4" />;
   };
 
   const sensors = useSensors(
@@ -157,13 +169,30 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
 
     if (active.id !== over.id) {
       setFiles((items) => {
-        const oldIndex = items.indexOf(active.id);
-        const newIndex = items.indexOf(over.id);
+        const oldIndex = items.findIndex(item => item.id === active.id);
+        const newIndex = items.findIndex(item => item.id === over.id);
         return arrayMove(items, oldIndex, newIndex);
       });
     }
   };
 
+  const handleSelected = useCallback((newPaths: string[]) => {
+    if (newPaths.length === 0) {
+      setFiles([]);
+    } else {
+      const newFiles = newPaths.map(path => ({
+        id: generateId(),
+        path
+      }));
+      
+      if (isMultiple) {
+        setFiles(prev => [...prev, ...newFiles]);
+      } else {
+        setFiles([newFiles[0]]);
+      }
+    }
+  }, [isMultiple]);
+
   return (
     <div className="space-y-2">
       <div className="space-y-2">
@@ -173,14 +202,15 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
           onDragEnd={handleDragEnd}
         >
           <SortableContext 
-            items={files}
+            items={files.map(f => f.id)}
             strategy={verticalListSortingStrategy}
           >
             {files.map((file) => (
               <SortableItem 
-                key={file} 
-                file={file} 
-                onRemove={handleRemove}
+                key={file.id}
+                id={file.id}
+                file={file.path}
+                onRemove={() => handleRemove(file.id)}
                 getFileIcon={getFileIcon}
               />
             ))}
@@ -188,13 +218,33 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
         </DndContext>
       </div>
       
-      {(!files.length || isMultiple) && (
-        <MediaUpload path={uploadPath} onUpload={handleUpload}>
-          <Button type="button" size="sm" className="gap-2">
-            <Upload className="h-3.5 w-3.5"/>
-            Upload
-          </Button>
-        </MediaUpload>
+      {remainingSlots > 0 && (
+        <div className="flex gap-2">
+          <MediaUpload path={rootPath} onUpload={handleUpload}>
+            <Button type="button" size="sm" variant="outline" className="gap-2">
+              <Upload className="h-3.5 w-3.5"/>
+              Upload
+            </Button>
+          </MediaUpload>      
+          <TooltipProvider>
+            <Tooltip>        
+              <MediaDialog
+                initialPath={rootPath}
+                maxSelected={remainingSlots}
+                onSubmit={handleSelected}
+              >
+                <TooltipTrigger asChild>
+                  <Button type="button" size="icon-sm" variant="outline">
+                    <FolderOpen className="h-3.5 w-3.5"/>
+                  </Button>
+                </TooltipTrigger>
+              </MediaDialog>
+              <TooltipContent>
+                Select from media
+              </TooltipContent>
+            </Tooltip>
+          </TooltipProvider>
+        </div>
       )}
     </div>
   );
diff --git a/fields/core/uuid/edit-component.tsx b/fields/core/uuid/edit-component.tsx
index 1446c247..e2bea7f2 100644
--- a/fields/core/uuid/edit-component.tsx
+++ b/fields/core/uuid/edit-component.tsx
@@ -33,7 +33,8 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
             <TooltipTrigger asChild>
               <Button 
                 type="button" 
-                variant="outline" 
+                variant="outline"
+                size="icon"
                 onClick={generateNewUUID}
                 className="shrink-0"
               >
diff --git a/lib/config.ts b/lib/config.ts
index 7190d483..1b6b8ae4 100644
--- a/lib/config.ts
+++ b/lib/config.ts
@@ -36,37 +36,51 @@ const normalizeConfig = (configObject: any) => {
 
   const configObjectCopy = JSON.parse(JSON.stringify(configObject));
   
-  if (configObjectCopy?.media != null) {
+  if (configObjectCopy?.media) {
     if (typeof configObjectCopy.media === "string") {
-      // Ensure media.input is a relative path
+      // Ensure media.input is a relative path (and add name and label)
       const relativePath = configObjectCopy.media.replace(/^\/|\/$/g, "");
-      configObjectCopy.media = {
+      configObjectCopy.media = [{
+        name: "media",
+        label: "Media",
         input: relativePath,
         output: `/${relativePath}`,
-      };
-    } else {
-      if (configObjectCopy.media?.input != null && typeof configObjectCopy.media.input === "string") {
+      }];
+    } else if (typeof configObjectCopy.media === "object" && !Array.isArray(configObjectCopy.media)) {
+      // Ensure it's an array of media configurations (and add name and label)
+      configObjectCopy.media = [{
+        name: "media",
+        label: "Media",
+        ...configObjectCopy.media
+      }];
+    }
+
+    // We normalize each media configuration
+    configObjectCopy.media = configObjectCopy.media.map((mediaConfig: any) => {     
+      if (mediaConfig.input != null && typeof mediaConfig.input === "string") {
         // Make sure input is relative
-        configObjectCopy.media.input = configObjectCopy.media.input.replace(/^\/|\/$/g, "");
+        mediaConfig.input = mediaConfig.input.replace(/^\/|\/$/g, "");
       }
-      if (configObjectCopy.media.output != null && configObjectCopy.media.output !== "/" && typeof configObjectCopy.media.output === "string") {
+      if (mediaConfig.output != null && mediaConfig.output !== "/" && typeof mediaConfig.output === "string") {
         // Make sure output doesn"t have a trailing slash
-        configObjectCopy.media.output = configObjectCopy.media.output.replace(/\/$/, "");
+        mediaConfig.output = mediaConfig.output.replace(/\/$/, "");
       }
-      if (configObjectCopy.media.categories != null) {
-        if (configObjectCopy.media.extensions != null) {
-          delete configObjectCopy.media.categories;
-        } else if (Array.isArray(configObjectCopy.media.categories)) {
-          configObjectCopy.media.extensions = [];
-          configObjectCopy.media.categories.map((category: string) => {
+      if (mediaConfig.categories != null) {
+        if (mediaConfig.extensions != null) {
+          delete mediaConfig.categories;
+        } else if (Array.isArray(mediaConfig.categories)) {
+          mediaConfig.extensions = [];
+          mediaConfig.categories.map((category: string) => {
             if (extensionCategories[category] != null) {
-              configObjectCopy.media.extensions = configObjectCopy.media.extensions.concat(extensionCategories[category]);
+              mediaConfig.extensions = mediaConfig.extensions.concat(extensionCategories[category]);
             }
           });
-          delete configObjectCopy.media.categories;
+          delete mediaConfig.categories;
         }
       }
-    }
+
+      return mediaConfig;
+    });
   }
 
   if (configObjectCopy.content && Array.isArray(configObjectCopy?.content) && configObjectCopy.content.length > 0) {
diff --git a/lib/configSchema.ts b/lib/configSchema.ts
index 002e6d9b..bfe6ccb8 100644
--- a/lib/configSchema.ts
+++ b/lib/configSchema.ts
@@ -6,38 +6,53 @@
 
 import { z } from "zod";
 
+// Media configuration object schema
+const MediaConfigObject = z.object({
+  input: z.string({
+    message: "'input' is required."
+  }).regex(/^[^/].*[^/]$|^$/, {
+    message: "'input' must be a valid relative path (no leading or trailing slash)."
+  }),
+  output: z.string({
+    message: "'output' is required."
+  }).regex(/^(\/?[^/].*[^/]$|^\/?$)/, {
+    message: "'output' must be a valid path with no trailing slash."
+  }),
+  path: z.string().regex(/^[^/].*[^/]$|^$/, {
+    message: "'path' must be a valid relative path (no leading or trailing slash)."
+  }).optional(),
+  extensions: z.array(z.string({
+    message: "Entries in the 'extensions' array must be strings."
+  }), {
+    message: "'extensions' must be an array of strings."
+  }).optional(),
+  categories: z.array(z.enum(["image", "document", "video", "audio", "compressed", "code", "font", "spreadsheet"], {
+    message: "Entries in the 'categories' array must be 'image', 'document', 'video', 'audio', 'compressed', 'code', 'font', or 'spreadsheet'."
+  }), {
+    message: "'categories' must be an array of strings."
+  }).optional(),
+}).strict();
+
+// Named media configuration schema
+const NamedMediaConfig = MediaConfigObject.extend({
+  name: z.string({
+    required_error: "'name' is required for media configurations in array format.",
+    invalid_type_error: "'name' must be a string.",
+  }),
+  label: z.string({
+    message: "'label' must be a string."
+  }).optional(),
+});
+
 // Media schema
 const MediaSchema = z.union([
   z.string().regex(/^[^/].*[^/]$|^$/, {
     message: "'media' must be a valid relative path (no leading or trailing slash)."
   }),
-  z.object({
-    input: z.string({
-      message: "'input' is required."
-    }).regex(/^[^/].*[^/]$|^$/, {
-      message: "'input' must be a valid relative path (no leading or trailing slash)."
-    }),
-    output: z.string({
-      message: "'output' is required."
-    }).regex(/^(\/?[^/].*[^/]$|^\/?$)/, {
-      message: "'output' must be a valid path with no trailing slash."
-    }),
-    path: z.string().regex(/^[^/].*[^/]$|^$/, {
-      message: "'path' must be a valid relative path (no leading or trailing slash)."
-    }).optional(),
-    extensions: z.array(z.string({
-      message: "Entries in the 'extensions' array must be strings."
-    }), {
-      message: "'extensions' must be an array of strings."
-    }).optional(),
-    categories: z.array(z.enum(["image", "document", "video", "audio", "compressed"], {
-      message: "Entries in the 'categories' array must be 'image', 'document', 'video', 'audio', or 'compressed'."
-    }), {
-      message: "'categories' must be an array of strings."
-    }).optional(),
-  }, {
-    message: "'media' must be a string (relative path) or an object with 'input' and 'output' attributes."
-  }).strict()
+  MediaConfigObject,
+  z.array(NamedMediaConfig, {
+    message: "'media' must be a string, an object, or an array of named media configurations."
+  })
 ]);
 
 // Content entry fields schema
@@ -56,7 +71,7 @@ const FieldObjectSchema: z.ZodType<any> = z.lazy(() => z.object({
   ]).optional(),
   description: z.string().optional().nullable(),
   type: z.enum([
-    "boolean", "code", "date", "image", "number", "object", "rich-text",
+    "boolean", "code", "date", "file", "image", "number", "object", "rich-text",
     "select", "string", "text", "uuid"
   ], {
     message: "'type' is required and must be set to a valid field type (see documentation)."
diff --git a/lib/schema.ts b/lib/schema.ts
index 84f5f135..ea277ce3 100644
--- a/lib/schema.ts
+++ b/lib/schema.ts
@@ -61,7 +61,7 @@ const initializeState = (
       appliedValue = field.list
         ? (typeof field.list === "object" && field.list.default)
           ? field.list.default
-          : [getDefaultValue(field)]
+          : undefined
         : getDefaultValue(field);
     }
     return appliedValue;

From 742ffe32c82e7b3d5e759a4579e12a2837f838c2 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 17 Mar 2025 11:50:29 +0800
Subject: [PATCH 38/95] Refining caching

---
 .../[owner]/[repo]/[branch]/media/page.tsx    | 24 ------------
 .../[branch]/files/[path]/rename/route.ts     | 23 ++++++-----
 .../[repo]/[branch]/files/[path]/route.ts     | 38 ++++++++++++-------
 .../[repo]/[branch]/media/[path]/route.ts     |  2 +-
 components/empty-create.tsx                   | 16 ++++----
 components/media/media-dialog.tsx             | 11 +++++-
 components/media/media-upload.tsx             | 10 ++++-
 components/media/media-view.tsx               | 10 ++---
 components/repo/repo-nav.tsx                  | 16 ++++----
 fields/core/file/edit-component.tsx           | 11 ++++--
 lib/config.ts                                 |  6 +--
 lib/configSchema.ts                           |  9 ++---
 lib/githubCache.ts                            | 19 +++++++++-
 lib/schema.ts                                 |  8 ++--
 14 files changed, 114 insertions(+), 89 deletions(-)
 delete mode 100644 app/(main)/[owner]/[repo]/[branch]/media/page.tsx

diff --git a/app/(main)/[owner]/[repo]/[branch]/media/page.tsx b/app/(main)/[owner]/[repo]/[branch]/media/page.tsx
deleted file mode 100644
index 135c81e5..00000000
--- a/app/(main)/[owner]/[repo]/[branch]/media/page.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-"use client";
-
-import { useSearchParams } from "next/navigation";
-import { useConfig } from "@/contexts/config-context";
-import { MediaView} from "@/components/media/media-view";
-
-export default function Page() {
-  const searchParams = useSearchParams();
-  const path = searchParams.get("path") || "";
-
-  const { config } = useConfig();
-  if (!config) throw new Error(`Configuration not found.`);
-
-  return (
-    <div className="max-w-screen-xl mx-auto flex-1 flex flex-col h-full">
-      <header className="flex items-center mb-6">
-        <h1 className="font-semibold text-lg md:text-2xl">Media</h1>
-      </header>
-      <div className="flex flex-col relative flex-1">
-        <MediaView initialPath={path}/>
-      </div>
-    </div>
-  );
-}
\ No newline at end of file
diff --git a/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts b/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
index 5f2592d6..5230ffc0 100644
--- a/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
@@ -39,12 +39,14 @@ export async function POST(
     const normalizedNewPath = normalizePath(data.newPath);
     if (normalizedPath === normalizedNewPath) throw new Error(`New path "${data.newPath}" is the same as the old path.`);
 
+    let schema;
+
     switch (data.type) {
       case "content":
         if (!data.name) throw new Error(`"name" is required for content.`);
 
-        const schema = getSchemaByName(config.object, data.name);
-        if (!schema) throw new Error(`Schema not found for ${data.name}.`);
+        schema = getSchemaByName(config.object, data.name);
+        if (!schema) throw new Error(`Content schema not found for ${data.name}.`);
 
         if (schema.type === "file") throw new Error(`Renaming content of type "file" isn't allowed.`);
         
@@ -55,18 +57,21 @@ export async function POST(
         if (getFileExtension(normalizedNewPath) !== schema.extension) throw new Error(`Invalid extension "${getFileExtension(normalizedNewPath)}" for ${data.type} "${data.name}".`);
         break;
       case "media":
-        if (!config.object.media) throw new Error(`No media configuration found for ${params.owner}/${params.repo}/${params.branch}.`);
+        if (!data.name) throw new Error(`"name" is required for media.`);
+
+        schema = getSchemaByName(config.object, data.name, "media");
+        if (!schema) throw new Error(`Media schema not found for ${data.name}.`);
         
-        if (!normalizedPath.startsWith(config.object.media.input)) throw new Error(`Invalid path "${params.path}" for media.`);
-        if (!normalizedNewPath.startsWith(config.object.media.input)) throw new Error(`Invalid path "${data.newPath}" for media.`);
+        if (!normalizedPath.startsWith(schema.input)) throw new Error(`Invalid path "${params.path}" for media.`);
+        if (!normalizedNewPath.startsWith(schema.input)) throw new Error(`Invalid path "${data.newPath}" for media.`);
         
         if (
-          config.object.media.extensions?.length > 0 &&
-          !config.object.media.extensions.includes(getFileExtension(normalizedPath))
+          schema.extensions?.length > 0 &&
+          !schema.extensions.includes(getFileExtension(normalizedPath))
         ) throw new Error(`Invalid extension "${getFileExtension(normalizedPath)}" for media.`);
         if (
-          config.object.media.extensions?.length > 0 &&
-          !config.object.media.extensions.includes(getFileExtension(normalizedNewPath))
+          schema.extensions?.length > 0 &&
+          !schema.extensions.includes(getFileExtension(normalizedNewPath))
         ) throw new Error(`Invalid extension "${getFileExtension(normalizedNewPath)}" for media.`);
         break;
     }
diff --git a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
index 9284da92..4a4ccde3 100644
--- a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
@@ -38,13 +38,14 @@ export async function POST(
     const data: any = await request.json();
 
     let contentBase64;
+    let schema;
 
     switch (data.type) {
       case "content":
         if (!data.name) throw new Error(`"name" is required for content.`);
 
-        let schema = getSchemaByName(config?.object, data.name);
-        if (!schema) throw new Error(`Schema not found for ${data.name}.`);
+        schema = getSchemaByName(config?.object, data.name);
+        if (!schema) throw new Error(`Content schema not found for ${data.name}.`);
 
         if (!normalizedPath.startsWith(schema.path)) throw new Error(`Invalid path "${params.path}" for ${data.type} "${data.name}".`);
 
@@ -108,17 +109,20 @@ export async function POST(
         }
         break;
       case "media":
-        if (!config?.object.media) throw new Error(`No media configuration found for ${params.owner}/${params.repo}/${params.branch}.`);
+        if (!data.name) throw new Error(`"name" is required for media.`);
 
-        if (!normalizedPath.startsWith(config.object.media.input)) throw new Error(`Invalid path "${params.path}" for media.`);
+        schema = getSchemaByName(config?.object, data.name, "media");
+        if (!schema) throw new Error(`Media schema not found for ${data.name}.`);
+
+        if (!normalizedPath.startsWith(schema.input)) throw new Error(`Invalid path "${params.path}" for media "${data.name}".`);
         
         if (getFileName(normalizedPath) === ".gitkeep") {
           // Folder creation
           contentBase64 = "";
         } else {
           if (
-            config.object.media.extensions?.length > 0 &&
-            !config.object.media.extensions.includes(getFileExtension(normalizedPath))
+            schema.extensions?.length > 0 &&
+            !schema.extensions.includes(getFileExtension(normalizedPath))
           ) throw new Error(`Invalid extension "${getFileExtension(normalizedPath)}" for media.`);
 
           contentBase64 = data.content;
@@ -153,8 +157,9 @@ export async function POST(
       await updateConfig(newConfig);
     }
     
-    // Update cache for content and settings files, but not media
     if (response?.data.content && response?.data.commit && data.type !== "media") {
+      // If the file is successfully saved, update the cache
+      // TODO: add media caching (requires split between listing and displaying media)
       await updateFileCache(
         params.owner,
         params.repo,
@@ -297,25 +302,30 @@ export async function DELETE(
     if (!config) throw new Error(`Configuration not found for ${params.owner}/${params.repo}/${params.branch}.`);
 
     const normalizedPath = normalizePath(params.path);
-    
+    let schema;
+
     switch (type) {
       case "content":
         if (!name) throw new Error(`"name" is required for content.`);
 
-        const schema = getSchemaByName(config.object, name);
-        if (!schema) throw new Error(`Schema not found for ${name}.`);
+        schema = getSchemaByName(config.object, name);
+        if (!schema) throw new Error(`Content schema not found for ${name}.`);
         
         if (!normalizedPath.startsWith(schema.path)) throw new Error(`Invalid path "${params.path}" for ${type} "${name}".`);
         
         if (getFileExtension(normalizedPath) !== schema.extension) throw new Error(`Invalid extension "${getFileExtension(normalizedPath)}" for ${type} "${name}".`);
         break;
       case "media":
-        if (!config.object.media) throw new Error(`No media configuration found for ${params.owner}/${params.repo}/${params.branch}.`);
-        if (!normalizedPath.startsWith(config.object.media.input)) throw new Error(`Invalid path "${params.path}" for media.`);
+        if (!name) throw new Error(`"name" is required for media.`);
+
+        schema = getSchemaByName(config.object, name, "media");
+        if (!schema) throw new Error(`Media schema not found for ${name}.`);
+
+        if (!normalizedPath.startsWith(schema.input)) throw new Error(`Invalid path "${params.path}" for media "${name}".`);
 
         if (
-          config.object.media.extensions?.length > 0 &&
-          !config.object.media.extensions.includes(getFileExtension(normalizedPath))
+          schema.extensions?.length > 0 &&
+          !schema.extensions.includes(getFileExtension(normalizedPath))
         ) throw new Error(`Invalid extension "${getFileExtension(normalizedPath)}" for media.`);
         break;
     }
diff --git a/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts
index 6493b262..9e05b7e6 100644
--- a/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts
@@ -58,7 +58,7 @@ export async function GET(
     let results = response.data;
 
     if (mediaConfig.extensions && mediaConfig.extensions.length > 0) {
-      results = response.data.filter((item) => {
+      results = results.filter((item) => {
         if (item.type === "dir") return true;
         const extension = getFileExtension(item.name);
         return mediaConfig.extensions.includes(extension);
diff --git a/components/empty-create.tsx b/components/empty-create.tsx
index 24c190a1..84c8955a 100644
--- a/components/empty-create.tsx
+++ b/components/empty-create.tsx
@@ -33,16 +33,15 @@ const EmptyCreate = ({
     toCreate = "configuration file";
     redirectTo = `${redirectTo}/settings`;
   } else if (type === "content" || type === "media") {
+    if (!name) throw new Error(`"name" is required.`);
+    const schema = getSchemaByName(config.object, name, type);
+    if (!schema) throw new Error(`Schema not found for ${name}.`);
+
     if (type === "media") {
-      path = `${config.object.media?.input}/.gitkeep`;
+      path = `${schema.input}/.gitkeep`;
       toCreate = "media folder";
-      redirectTo = `${redirectTo}/media`;
+      redirectTo = `${redirectTo}/media/${schema.name}`;
     } else {
-      if (!name) throw new Error(`"name" is required for content.`);
-      
-      const schema = getSchemaByName(config.object, name);
-      if (!schema) throw new Error(`Schema not found for ${name}.`);
-
       if (schema.type === "file") {
         path = schema.path;
         toCreate = "file";
@@ -54,7 +53,6 @@ const EmptyCreate = ({
         path = `${schema.path}/.gitkeep`;
         toCreate = "collection folder";
       }
-
       redirectTo = `${redirectTo}/${schema.type}/${schema.name}`;
     }
   } else {
@@ -92,7 +90,7 @@ const EmptyCreate = ({
         loading: `Creating ${toCreate}`,
         success: (response: any) => {
           // TODO: for media, we want to navigate to the root, not redirect in case it's in a dialog
-          router.push(redirectTo);
+          router.push(`${redirectTo}?empty-created`);
           router.refresh();
           return `Successfully created ${toCreate}.`;
         },
diff --git a/components/media/media-dialog.tsx b/components/media/media-dialog.tsx
index c793388e..83d236dc 100644
--- a/components/media/media-dialog.tsx
+++ b/components/media/media-dialog.tsx
@@ -14,6 +14,7 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
+import { getSchemaByName } from "@/lib/schema";
 
 export interface MediaDialogHandle {
   open: () => void;
@@ -21,12 +22,14 @@ export interface MediaDialogHandle {
 }
 
 const MediaDialog = forwardRef(({
+  name,
   selected,
   onSubmit,
   maxSelected,
   initialPath,
   children
 }: {
+  name?: string,
   onSubmit: (images: string[]) => void,
   selected?: string[],
   maxSelected?: number,
@@ -36,6 +39,10 @@ const MediaDialog = forwardRef(({
   const { config } = useConfig();
   if (!config) throw new Error(`Configuration not found.`);
 
+  const configMedia = name
+    ? getSchemaByName(config.object, name, "media")
+    : config.object.media[0];
+
   const selectedImagesRef = useRef(selected || []);
   const [open, setOpen] = useState(false);
 
@@ -65,11 +72,11 @@ const MediaDialog = forwardRef(({
           <DialogDescription></DialogDescription>
         </DialogHeader>
         
-        <MediaView initialSelected={selected || []} onSelect={handleSelect} maxSelected={maxSelected} initialPath={initialPath || ""}/>
+        <MediaView name={configMedia.name} initialSelected={selected || []} onSelect={handleSelect} maxSelected={maxSelected} initialPath={initialPath || ""}/>
         {config.object.media?.input &&
           <DialogFooter>
             <DialogClose asChild>
-              <Button type="submit" onClick={handleSubmit}>Save changes</Button>
+              <Button type="submit" onClick={handleSubmit}>Select</Button>
             </DialogClose>
           </DialogFooter>
         }
diff --git a/components/media/media-upload.tsx b/components/media/media-upload.tsx
index d2829d88..6143991f 100644
--- a/components/media/media-upload.tsx
+++ b/components/media/media-upload.tsx
@@ -4,21 +4,28 @@ import { useRef, isValidElement, cloneElement } from "react";
 import { useConfig } from "@/contexts/config-context";
 import { joinPathSegments } from "@/lib/utils/file";
 import { toast } from "sonner";
+import { getSchemaByName } from "@/lib/schema";
 
 const MediaUpload = ({
   children,
   path,
   onUpload,
+  name
 }: {
   children: React.ReactElement<{ onClick: () => void }>;
   path?: string;
   onUpload?: (path: string) => void;
+  name?: string;
 }) => {
   const fileInputRef = useRef(null);
 
   const { config } = useConfig();
   if (!config) throw new Error(`Configuration not found.`);
 
+  const configMedia = name
+    ? getSchemaByName(config.object, name, "media")
+    : config.object.media[0];
+
   const handleTriggerClick = () => {
     if (fileInputRef.current) {
       (fileInputRef.current as HTMLInputElement).click();
@@ -53,6 +60,7 @@ const MediaUpload = ({
                   headers: { "Content-Type": "application/json" },
                   body: JSON.stringify({
                     type: "media",
+                    name: configMedia.name,
                     content,
                   }),
                 });
@@ -88,7 +96,7 @@ const MediaUpload = ({
     ? cloneElement(children, { onClick: handleTriggerClick })
     : null;
 
-  const mediaExtensions = config?.object.media?.extensions;
+  const mediaExtensions = configMedia.extensions;
   const accept = mediaExtensions && mediaExtensions.length > 0
     ? mediaExtensions.map((extension: string) => `.${extension}`).join(",")
     : undefined;
diff --git a/components/media/media-view.tsx b/components/media/media-view.tsx
index a43e6c7d..5bd47c43 100644
--- a/components/media/media-view.tsx
+++ b/components/media/media-view.tsx
@@ -78,7 +78,7 @@ const MediaView = ({
         setError(null);
 
         try {
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media/${encodeURIComponent(path)}`);
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media/${encodeURIComponent(path)}${name && `?name=${encodeURIComponent(name)}`}`);
           if (!response.ok) throw new Error(`Failed to fetch media: ${response.status} ${response.statusText}`);
 
           const data: any = await response.json();
@@ -222,7 +222,7 @@ const MediaView = ({
             description={`The media folder "${mediaConfig.input}" has not been created yet.`}
             className="absolute inset-0"
           >
-          <EmptyCreate type="media">Create folder</EmptyCreate>
+          <EmptyCreate type="media" name={mediaConfig.name}>Create folder</EmptyCreate>
         </Message>
       );
     } else {
@@ -247,12 +247,12 @@ const MediaView = ({
             <CornerLeftUp className="w-4 h-4"/>
           </Button>
         </div>
-        <FolderCreate path={path} type="media" onCreate={handleFolderCreate}>
+        <FolderCreate path={path} name={mediaConfig.name} type="media" onCreate={handleFolderCreate}>
           <Button type="button" variant="outline" className="ml-auto" size="icon-sm">
             <FolderPlus className="h-3.5 w-3.5"/>
           </Button>
         </FolderCreate>
-        <MediaUpload path={path} onUpload={handleUpload}>
+        <MediaUpload name={mediaConfig.name} path={path} onUpload={handleUpload}>
           <Button type="button" size="sm" className="gap-2">
             <Upload className="h-3.5 w-3.5"/>
             Upload
@@ -302,7 +302,7 @@ const MediaView = ({
                                   <div className="text-sm font-medium truncate">{item.name}</div>
                                   <div className="text-xs text-muted-foreground truncate">{getFileSize(item.size)}</div>
                                 </div>
-                                <FileOptions path={item.path} sha={item.sha} type="media" onDelete={handleDelete} onRename={handleRename} portalProps={{container: filesGridRef.current}}>
+                                <FileOptions path={item.path} sha={item.sha} type="media" name={mediaConfig.name} onDelete={handleDelete} onRename={handleRename} portalProps={{container: filesGridRef.current}}>
                                   <Button variant="ghost" size="icon" className="shrink-0">
                                     <EllipsisVertical className="h-4 w-4" />
                                   </Button>
diff --git a/components/repo/repo-nav.tsx b/components/repo/repo-nav.tsx
index 8cd9801c..2e37257e 100644
--- a/components/repo/repo-nav.tsx
+++ b/components/repo/repo-nav.tsx
@@ -56,14 +56,12 @@ const RepoNav = ({
       label: item.label || item.name,
     })) || [];
 
-    const mediaItem = configObject.media
-      ? {
-        key: "media",
-        icon: <FolderOpen className="h-5 w-5 mr-2" />,
-        href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media`,
-        label: "Media"
-      }
-      : null;
+    const mediaItems = configObject.media?.map((item: any) => ({
+      key: item.name || "media",
+      icon: <FolderOpen className="h-5 w-5 mr-2" />,
+      href: `/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media/${item.name}`,
+      label: item.label || item.name || "Media"
+    })) || [];
 
     const settingsItem = configObject.settings !== false
       ? {
@@ -85,7 +83,7 @@ const RepoNav = ({
 
     return [
       ...contentItems,
-      mediaItem,
+      ...mediaItems,
       settingsItem,
       collaboratorsItem
     ].filter(Boolean);
diff --git a/fields/core/file/edit-component.tsx b/fields/core/file/edit-component.tsx
index 4fa46150..b443819a 100644
--- a/fields/core/file/edit-component.tsx
+++ b/fields/core/file/edit-component.tsx
@@ -18,6 +18,7 @@ import { arrayMove, SortableContext, sortableKeyboardCoordinates, verticalListSo
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import { v4 as uuidv4 } from 'uuid';
+import { getSchemaByName } from "@/lib/schema";
 
 const generateId = () => uuidv4().slice(0, 8);
 
@@ -97,7 +98,10 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
   );
 
   const isMultiple = field.options?.multiple !== undefined && field.options?.multiple !== false;
-  const rootPath = field.options?.path || field.options?.input || config?.object.media?.input;
+  const mediaConfig = field.options?.media
+    ? getSchemaByName(config?.object, field.options?.media, "media")
+    : config?.object.media[0];
+  const rootPath = field.options?.path || mediaConfig.input;
   const remainingSlots = field.options?.multiple
     ? field.options.multiple.max
       ? field.options.multiple.max - files.length
@@ -220,15 +224,16 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
       
       {remainingSlots > 0 && (
         <div className="flex gap-2">
-          <MediaUpload path={rootPath} onUpload={handleUpload}>
+          <MediaUpload path={rootPath} name={mediaConfig.name} onUpload={handleUpload}>
             <Button type="button" size="sm" variant="outline" className="gap-2">
               <Upload className="h-3.5 w-3.5"/>
               Upload
             </Button>
           </MediaUpload>      
           <TooltipProvider>
-            <Tooltip>        
+            <Tooltip>
               <MediaDialog
+                name={mediaConfig.name}
                 initialPath={rootPath}
                 maxSelected={remainingSlots}
                 onSubmit={handleSelected}
diff --git a/lib/config.ts b/lib/config.ts
index 1b6b8ae4..94e873e6 100644
--- a/lib/config.ts
+++ b/lib/config.ts
@@ -41,7 +41,7 @@ const normalizeConfig = (configObject: any) => {
       // Ensure media.input is a relative path (and add name and label)
       const relativePath = configObjectCopy.media.replace(/^\/|\/$/g, "");
       configObjectCopy.media = [{
-        name: "media",
+        name: "default",
         label: "Media",
         input: relativePath,
         output: `/${relativePath}`,
@@ -49,14 +49,14 @@ const normalizeConfig = (configObject: any) => {
     } else if (typeof configObjectCopy.media === "object" && !Array.isArray(configObjectCopy.media)) {
       // Ensure it's an array of media configurations (and add name and label)
       configObjectCopy.media = [{
-        name: "media",
+        name: "default",
         label: "Media",
         ...configObjectCopy.media
       }];
     }
 
     // We normalize each media configuration
-    configObjectCopy.media = configObjectCopy.media.map((mediaConfig: any) => {     
+    configObjectCopy.media = configObjectCopy.media.map((mediaConfig: any) => {
       if (mediaConfig.input != null && typeof mediaConfig.input === "string") {
         // Make sure input is relative
         mediaConfig.input = mediaConfig.input.replace(/^\/|\/$/g, "");
diff --git a/lib/configSchema.ts b/lib/configSchema.ts
index bfe6ccb8..6e2c1227 100644
--- a/lib/configSchema.ts
+++ b/lib/configSchema.ts
@@ -6,7 +6,7 @@
 
 import { z } from "zod";
 
-// Media configuration object schema
+// Media configuration object schema (for single object)
 const MediaConfigObject = z.object({
   input: z.string({
     message: "'input' is required."
@@ -31,17 +31,16 @@ const MediaConfigObject = z.object({
   }), {
     message: "'categories' must be an array of strings."
   }).optional(),
+  name: z.string().optional(),
+  label: z.string().optional(),
 }).strict();
 
-// Named media configuration schema
+// Named media configuration schema (for array entries)
 const NamedMediaConfig = MediaConfigObject.extend({
   name: z.string({
     required_error: "'name' is required for media configurations in array format.",
     invalid_type_error: "'name' must be a string.",
   }),
-  label: z.string({
-    message: "'label' must be a string."
-  }).optional(),
 });
 
 // Media schema
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index e477e476..80fd9547 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -235,6 +235,7 @@ const updateFileCache = async (
 
   switch (operation.type) {
     case 'delete':
+      // We always remove entries from the cache when the file is deleted
       await db.delete(cachedEntriesTable).where(
         and(
           eq(cachedEntriesTable.owner, owner),
@@ -265,6 +266,7 @@ const updateFileCache = async (
       };
 
       if (operation.type === 'modify') {
+        // We always update entries in the cache if they are already present
         await db.update(cachedEntriesTable)
           .set({
             content: entry.content,
@@ -280,7 +282,22 @@ const updateFileCache = async (
             )
           );
       } else {
-        await db.insert(cachedEntriesTable).values(entry);
+        // We only cache collections (and maybe media folders later on). When a
+        // file is added, we only add it to the cache if there are already existing
+        // entries with the same parent path (meaning getCachedCollection (or
+        // getCachedMedia once we have media) has already been called on this path).
+        const sibling = await db.query.cachedEntriesTable.findFirst({
+          where: and(
+            eq(cachedEntriesTable.owner, owner),
+            eq(cachedEntriesTable.repo, repo),
+            eq(cachedEntriesTable.branch, branch),
+            eq(cachedEntriesTable.parentPath, parentPath)
+          )
+        });
+
+        if (sibling) {
+          await db.insert(cachedEntriesTable).values(entry);
+        }
       }
       break;
   }
diff --git a/lib/schema.ts b/lib/schema.ts
index ea277ce3..fa9d56a1 100644
--- a/lib/schema.ts
+++ b/lib/schema.ts
@@ -184,11 +184,13 @@ const getSchemaByPath = (config: Record<string, any>, path: string) => {
   return schema ? JSON.parse(JSON.stringify(schema)) : null;
 };
 
-// Retrieve the matching schema for a type
-const getSchemaByName = (config: Record<string, any> | null | undefined, name: string) => {
+// Retrieve the matching schema for a media or content entry
+const getSchemaByName = (config: Record<string, any> | null | undefined, name: string, type: string = "content") => {
   if (!config || !config.content || !name) return null;
   
-  const schema = config.content.find((item: Record<string, any>) => item.name === name);
+  const schema = (type === "media")
+    ? config.media.find((item: Record<string, any>) => item.name === name)
+    : config.content.find((item: Record<string, any>) => item.name === name);
 
   // We deep clone the object to avoid mutating config if schema is modified.
   return schema ? JSON.parse(JSON.stringify(schema)) : null;

From 978826053862cdea60f9c7d94f916b4e97fb02e3 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 17 Mar 2025 11:51:02 +0800
Subject: [PATCH 39/95] Adding back media page

---
 .../[repo]/[branch]/media/[name]/page.tsx     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 app/(main)/[owner]/[repo]/[branch]/media/[name]/page.tsx

diff --git a/app/(main)/[owner]/[repo]/[branch]/media/[name]/page.tsx b/app/(main)/[owner]/[repo]/[branch]/media/[name]/page.tsx
new file mode 100644
index 00000000..b1e606c4
--- /dev/null
+++ b/app/(main)/[owner]/[repo]/[branch]/media/[name]/page.tsx
@@ -0,0 +1,30 @@
+"use client";
+
+import { useSearchParams } from "next/navigation";
+import { useConfig } from "@/contexts/config-context";
+import { MediaView} from "@/components/media/media-view";
+
+export default function Page({
+  params
+}: {
+  params: {
+    name: string;
+  }
+}) {
+  const searchParams = useSearchParams();
+  const path = searchParams.get("path") || "";
+
+  const { config } = useConfig();
+  if (!config) throw new Error(`Configuration not found.`);
+  
+  return (
+    <div className="max-w-screen-xl mx-auto flex-1 flex flex-col h-full">
+      <header className="flex items-center mb-6">
+        <h1 className="font-semibold text-lg md:text-2xl">Media</h1>
+      </header>
+      <div className="flex flex-col relative flex-1">
+        <MediaView initialPath={path} name={params.name} />
+      </div>
+    </div>
+  );
+}
\ No newline at end of file

From 9af99eed31bc6e5dfc6889d82c0e88002e145433 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 17 Mar 2025 22:04:56 +0800
Subject: [PATCH 40/95] Refined cache strategy

---
 .../[branch]/files/[path]/rename/route.ts     |  18 +
 .../[repo]/[branch]/files/[path]/route.ts     |  15 +-
 .../[repo]/[branch]/media/[path]/route.ts     |  98 ----
 app/api/webhook/github/route.ts               |  12 +-
 components/media/media-view.tsx               |   6 +-
 components/thumbnail.tsx                      |   6 +-
 db/schema.ts                                  |   5 +
 fields/core/file/view-component.tsx           |  18 +-
 fields/core/image/edit-component.tsx          |  13 +-
 fields/core/image/view-component.tsx          |   6 +-
 fields/core/rich-text/edit-component.tsx      |   9 +-
 lib/githubCache.ts                            | 456 ++++++++++++++----
 lib/githubImage.ts                            |  11 +-
 13 files changed, 451 insertions(+), 222 deletions(-)
 delete mode 100644 app/api/[owner]/[repo]/[branch]/media/[path]/route.ts

diff --git a/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts b/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
index 5230ffc0..8ef6dfcd 100644
--- a/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/files/[path]/rename/route.ts
@@ -4,6 +4,7 @@ import { getConfig } from "@/lib/utils/config";
 import { getFileExtension, normalizePath } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
+import { updateFileCache } from "@/lib/githubCache";
 
 /**
  * Renames a file in a GitHub repository.
@@ -78,6 +79,23 @@ export async function POST(
     
     const response = await githubRenameFile(token, params.owner, params.repo, params.branch, normalizedPath, normalizedNewPath);
 
+    // Update the cache with the rename operation
+    await updateFileCache(
+      data.type === 'content' ? 'collection' : 'media',
+      params.owner,
+      params.repo,
+      params.branch,
+      {
+        type: 'rename',
+        path: normalizedPath,
+        newPath: normalizedNewPath,
+        commit: {
+          sha: response.sha,
+          timestamp: Date.now()
+        }
+      }
+    );
+
     // TODO: remove success message in backend 
     return Response.json({
       status: "success",
diff --git a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
index 4a4ccde3..cf08f47c 100644
--- a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
@@ -159,8 +159,8 @@ export async function POST(
     
     if (response?.data.content && response?.data.commit && data.type !== "media") {
       // If the file is successfully saved, update the cache
-      // TODO: add media caching (requires split between listing and displaying media)
       await updateFileCache(
+        data.type,
         params.owner,
         params.repo,
         params.branch,
@@ -168,7 +168,13 @@ export async function POST(
           type: data.sha ? 'modify' : 'add',
           path: response.data.content.path!,
           sha: response.data.content.sha!,
-          content: Buffer.from(contentBase64, 'base64').toString('utf-8')
+          content: Buffer.from(contentBase64, 'base64').toString('utf-8'),
+          size: response.data.content.size,
+          downloadUrl: response.data.content.download_url,
+          commit: {
+            sha: response.data.commit.sha!,
+            timestamp: new Date(response.data.commit.committer?.date ?? new Date().toISOString()).getTime()
+          }
         }
       );
     }
@@ -211,7 +217,7 @@ const githubSaveFile = async (
   const octokit = createOctokitInstance(token);
 
   try {
-    // First attempt - try with original path
+    // First attempt: try with original path
     const response = await octokit.rest.repos.createOrUpdateFileContents({
       owner,
       repo,
@@ -268,7 +274,7 @@ const githubSaveFile = async (
           }
         } catch (error: any) {
           if (i === 3 || error.status !== 422) throw error;
-          // Continue to next attempt if 422
+          // Continue to next attempt if 422 (file already exists)
         }
       }
     }
@@ -342,6 +348,7 @@ export async function DELETE(
 
     // Update cache after successful deletion
     await updateFileCache(
+      'collection',
       params.owner,
       params.repo,
       params.branch,
diff --git a/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts
deleted file mode 100644
index 9e05b7e6..00000000
--- a/app/api/[owner]/[repo]/[branch]/media/[path]/route.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { createOctokitInstance } from "@/lib/utils/octokit";
-import { getConfig } from "@/lib/utils/config";
-import { getFileExtension, normalizePath } from "@/lib/utils/file";
-import { getAuth } from "@/lib/auth";
-import { getToken } from "@/lib/token";
-
-// Add docs
-
-/**
- * Get the list of media files in a directory.
- *
- * GET /api/[owner]/[repo]/[branch]/media/[path]
- * 
- * Requires authentication.
- */
-
-export async function GET(
-  request: Request,
-  { params }: { params: { owner: string, repo: string, branch: string, path: string } }
-) {
-  try {
-    const { user, session } = await getAuth();
-    if (!session) return new Response(null, { status: 401 });
-
-    const token = await getToken(user, params.owner, params.repo);
-    if (!token) throw new Error("Token not found");
-
-    const config = await getConfig(params.owner, params.repo, params.branch);
-    if (!config) throw new Error(`Configuration not found for ${params.owner}/${params.repo}/${params.branch}.`);   
-    
-    const { searchParams } = new URL(request.url);
-    const mediaConfigName = searchParams.get('name');
-    
-    const mediaConfig = mediaConfigName
-      ? config.object.media.find((item: any) => item.name === mediaConfigName)
-      : config.object.media[0];
-
-    if (!mediaConfig) {
-      if (mediaConfigName) throw new Error(`No media configuration named "${mediaConfigName}" found for ${params.owner}/${params.repo}/${params.branch}.`);
-      throw new Error(`No media configuration found for ${params.owner}/${params.repo}/${params.branch}.`);
-    }
-
-    const normalizedPath = normalizePath(params.path);
-    if (!normalizedPath.startsWith(mediaConfig.input)) throw new Error(`Invalid path "${params.path}" for media.`);
-
-    const octokit = createOctokitInstance(token);
-    const response = await octokit.rest.repos.getContent({
-      owner: params.owner,
-      repo: params.repo,
-      path: normalizedPath,
-      ref: params.branch,
-    });
-
-    if (!Array.isArray(response.data)) {
-      throw new Error("Expected a directory but found a file.");
-    }
-
-    let results = response.data;
-
-    if (mediaConfig.extensions && mediaConfig.extensions.length > 0) {
-      results = results.filter((item) => {
-        if (item.type === "dir") return true;
-        const extension = getFileExtension(item.name);
-        return mediaConfig.extensions.includes(extension);
-      });
-    }
-
-    results.sort((a: any, b: any) => {
-      if (a.type === b.type) {
-        return a.name.localeCompare(b.name);
-      } else {
-        return a.type === "dir" ? -1 : 1;
-      }
-    });
-
-    return Response.json({
-      status: "success",
-      data: results.map((item: any) => {
-        return {
-          type: item.type,
-          sha: item.sha,
-          name: item.name,
-          path: item.path,
-          extension: item.type === "dir" ? undefined : getFileExtension(item.name),
-          size: item.size,
-          url: item.download_url
-        };
-      }),
-    });
-  } catch (error: any) {
-    console.error(error);
-    // TODO: better handling of GitHub errors
-    return Response.json({
-      status: "error",
-      message: error.status === 404 ? "Not found" : error.message,
-    });
-  }
-}
\ No newline at end of file
diff --git a/app/api/webhook/github/route.ts b/app/api/webhook/github/route.ts
index bc8e7294..00ec489c 100644
--- a/app/api/webhook/github/route.ts
+++ b/app/api/webhook/github/route.ts
@@ -4,7 +4,7 @@ import { db } from "@/db";
 import { collaboratorTable, githubInstallationTokenTable } from "@/db/schema";
 import { eq, inArray } from "drizzle-orm";
 import { normalizePath } from "@/lib/utils/file";
-import { updateCache } from "@/lib/githubCache";
+import { updateMultipleFilesCache } from "@/lib/githubCache";
 import { getInstallationToken } from "@/lib/token";
 
 /**
@@ -103,14 +103,20 @@ export async function POST(request: Request) {
 
           const installationToken = await getInstallationToken(owner, repo);
 
-          await updateCache(
+          const commit = {
+            sha: data.head_commit.id,
+            timestamp: new Date(data.head_commit.timestamp).getTime()
+          };
+
+          await updateMultipleFilesCache(
             owner,
             repo,
             branch,
             removedFiles,
             modifiedFiles,
             addedFiles,
-            installationToken
+            installationToken,
+            commit
           );
           break;
       }
diff --git a/components/media/media-view.tsx b/components/media/media-view.tsx
index 5bd47c43..c42bf6d7 100644
--- a/components/media/media-view.tsx
+++ b/components/media/media-view.tsx
@@ -38,7 +38,7 @@ const MediaView = ({
   maxSelected,
   onSelect,
 }: {
-  name?: string,
+  name: string,
   initialPath?: string,
   initialSelected?: string[],
   maxSelected?: number,
@@ -78,7 +78,7 @@ const MediaView = ({
         setError(null);
 
         try {
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media/${encodeURIComponent(path)}${name && `?name=${encodeURIComponent(name)}`}`);
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media/${encodeURIComponent(name)}/${encodeURIComponent(path)}`);
           if (!response.ok) throw new Error(`Failed to fetch media: ${response.status} ${response.statusText}`);
 
           const data: any = await response.json();
@@ -292,7 +292,7 @@ const MediaView = ({
                             }
                             <div className={onSelect && "hover:bg-muted peer-focus:ring-offset-background peer-focus:ring-2 peer-focus:ring-ring peer-focus:ring-offset-2 rounded-md peer-checked:ring-offset-background peer-checked:ring-offset-2 peer-checked:ring-2 peer-checked:ring-ring relative"}>
                               {extensionCategories.image.includes(item.extension)
-                                ? <Thumbnail path={item.path} className="rounded-t-md aspect-video"/>
+                                ? <Thumbnail name={mediaConfig.name} path={item.path} className="rounded-t-md aspect-video"/>
                                 : <div className="flex items-center justify-center rounded-md aspect-video">
                                     <File className="stroke-[0.5] h-24 w-24"/>
                                   </div>
diff --git a/components/thumbnail.tsx b/components/thumbnail.tsx
index a88e64fd..5f8562e2 100644
--- a/components/thumbnail.tsx
+++ b/components/thumbnail.tsx
@@ -9,9 +9,11 @@ import { Loader } from "@/components/loader";
 import { Ban, ImageOff } from "lucide-react";
 
 export function Thumbnail({
+  name,
   path,
   className
 }: {
+  name: string,
   path: string | null;
   className?: string;
 }) {
@@ -29,7 +31,7 @@ export function Thumbnail({
         setError(null);
         setRawUrl(null);
         try {
-          const url = await getRawUrl(owner, repo, branch, path, isPrivate);
+          const url = await getRawUrl(owner, repo, branch, name, path, isPrivate);
           setRawUrl(url);
         } catch (error: any) {
           setError(error.message);
@@ -40,8 +42,6 @@ export function Thumbnail({
     fetchRawUrl();
   }, [path, owner, repo, branch, isPrivate]);
 
-  // if (!path) return null;
-
   return (
     <div
       className={cn(
diff --git a/db/schema.ts b/db/schema.ts
index 6b8ed374..e3ec93a2 100644
--- a/db/schema.ts
+++ b/db/schema.ts
@@ -76,6 +76,7 @@ const configTable = sqliteTable("config", {
 
 const cachedEntriesTable = sqliteTable("cached_entries", {
   id: integer("id").primaryKey({ autoIncrement: true }),
+  context: text("context").notNull().default('collection'),
   owner: text("owner").notNull(),
   repo: text("repo").notNull(),
   branch: text("branch").notNull(),
@@ -85,6 +86,10 @@ const cachedEntriesTable = sqliteTable("cached_entries", {
   type: text("type").notNull(),
   content: text("content"),
   sha: text("sha"),
+  size: integer("size"),
+  downloadUrl: text("download_url"),
+  commitSha: text('commit_sha'),
+  commitTimestamp: integer('commit_timestamp'),
   lastUpdated: integer("last_updated").notNull()
 });
 
diff --git a/fields/core/file/view-component.tsx b/fields/core/file/view-component.tsx
index 0ac55249..08520356 100644
--- a/fields/core/file/view-component.tsx
+++ b/fields/core/file/view-component.tsx
@@ -1,8 +1,9 @@
 "use client";
 
 import { useMemo } from "react";
-import { Thumbnail } from "@/components/thumbnail";
 import { Field } from "@/types/field";
+import { File } from "lucide-react";
+import { getFileName } from "@/lib/utils/file";
 
 const ViewComponent = ({
   value,
@@ -13,17 +14,24 @@ const ViewComponent = ({
 }) => {
   const extraValuesCount = value && Array.isArray(value) ? value.length - 1 : 0;
 
-  const path = useMemo(() => {
+  const filename = useMemo(() => {
     return !value
       ? null
       : Array.isArray(value)
-        ? value[0]
-        : value;
+        ? getFileName(value[0])
+        : getFileName(value);
   }, [value]);
 
+  if (!filename) return null;
+
   return (
     <span className="flex items-center gap-x-1.5">
-      <Thumbnail path={path} className="w-8 rounded-md"/>
+      <span className="inline-flex rounded-full border px-2 py-0.5 text-sm font-medium items-center gap-x-1.5">
+        <File className="w-3 h-3 shrink-0"/>
+        <span className="text-ellipsis overflow-hidden whitespace-nowrap">
+          {filename}
+        </span>
+      </span>
       {extraValuesCount > 0 && (
         <span className="text-muted-foreground text-xs">
           +{extraValuesCount}
diff --git a/fields/core/image/edit-component.tsx b/fields/core/image/edit-component.tsx
index 2b57be66..da1b8f6d 100644
--- a/fields/core/image/edit-component.tsx
+++ b/fields/core/image/edit-component.tsx
@@ -22,6 +22,7 @@ import {
 } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import { Pencil, Trash2, ImagePlus } from "lucide-react";
+import { useConfig } from "@/contexts/config-context";
 
 // TODO: disable sortable for single image
 // TODO: make component resilient to illegal parentPath
@@ -29,10 +30,12 @@ import { Pencil, Trash2, ImagePlus } from "lucide-react";
 const SortableItem = ({
   id,
   path,
+  media,
   children
 }: {
   id: string,
   path: string,
+  media: string,
   children: React.ReactNode
 }) => {
   const {
@@ -50,11 +53,13 @@ const SortableItem = ({
     zIndex: isDragging ? 1000 : "auto"
   };
 
+  // const name = field.options?;
+
   return (
     <div ref={setNodeRef} style={style}>
       <div className="relative w-28">
         <div {...attributes} {...listeners}>
-          <Thumbnail path={path} className="aspect-square rounded-md outline-none"/>
+          <Thumbnail name={media} path={path} className="aspect-square rounded-md outline-none"/>
         </div>
         {children}
       </div>
@@ -71,6 +76,10 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
         : [{ id: "image-0", path: value }]
       : []
   );
+
+  const { config } = useConfig();
+
+  const mediaName = field.options?.media || config?.object.media[0].name;
   
   const maxImages = useMemo(() => {
     if (field.list && typeof field.list.max === 'number') {
@@ -133,7 +142,7 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
         <div className="flex flex-wrap gap-4 items-start">
 
           {images.map((item, index) => 
-            <SortableItem key={item.id} id={item.id} path={item.path}>
+            <SortableItem key={item.id} id={item.id} path={item.path} media={mediaName}>
               <footer className="absolute bottom-2 right-2">
                 <Button type="button" size="icon-xs" variant="outline" className="rounded-r-none focus-visible:ring-0 focus-visible:ring-offset-0 focus-visible:bg-muted" onClick={() => handleRemove(index)}>
                   <Trash2 className="h-4 w-4" />
diff --git a/fields/core/image/view-component.tsx b/fields/core/image/view-component.tsx
index 0ac55249..74843be6 100644
--- a/fields/core/image/view-component.tsx
+++ b/fields/core/image/view-component.tsx
@@ -3,6 +3,7 @@
 import { useMemo } from "react";
 import { Thumbnail } from "@/components/thumbnail";
 import { Field } from "@/types/field";
+import { useConfig } from "@/contexts/config-context";
 
 const ViewComponent = ({
   value,
@@ -21,9 +22,12 @@ const ViewComponent = ({
         : value;
   }, [value]);
 
+  const { config } = useConfig();
+  const mediaName = field.options?.media || config?.object.media[0].name;
+
   return (
     <span className="flex items-center gap-x-1.5">
-      <Thumbnail path={path} className="w-8 rounded-md"/>
+      <Thumbnail name={mediaName} path={path} className="w-8 rounded-md"/>
       {extraValuesCount > 0 && (
         <span className="text-muted-foreground text-xs">
           +{extraValuesCount}
diff --git a/fields/core/rich-text/edit-component.tsx b/fields/core/rich-text/edit-component.tsx
index 4363567d..c6ddcd49 100644
--- a/fields/core/rich-text/edit-component.tsx
+++ b/fields/core/rich-text/edit-component.tsx
@@ -63,7 +63,10 @@ const EditComponent = forwardRef((props: any, ref) => {
   const { config } = useConfig();
   const { isPrivate } = useRepo();
 
-  const { value, onChange } = props;
+  const { value, field, onChange } = props;
+  const mediaName = field.options?.media || config?.object.media[0].name;
+  if (!mediaName) throw new Error("No media defined.");
+
   const mediaDialogRef = useRef<MediaDialogHandle>(null);
   const bubbleMenuRef = useRef<HTMLDivElement | null>(null);
 
@@ -116,7 +119,7 @@ const EditComponent = forwardRef((props: any, ref) => {
     onUpdate: ({ editor }) => onChange(editor.getHTML()),
     onCreate: async ({ editor }) => {
       if (config && value) {
-        const initialContent = await relativeToRawUrls(config.owner, config.repo, config.branch, value, isPrivate);
+        const initialContent = await relativeToRawUrls(config.owner, config.repo, config.branch, mediaName, value, isPrivate);
         editor.commands.setContent(initialContent || "<p></p>");
       }
       setContentReady(true);
@@ -126,7 +129,7 @@ const EditComponent = forwardRef((props: any, ref) => {
   const handleMediaDialogSubmit = useCallback(async (images: string[]) => {
     if (config && editor) {
       const content = await Promise.all(images.map(async (image) => {
-        const url = await getRawUrl(config.owner, config.repo, config.branch, image, isPrivate);
+        const url = await getRawUrl(config.owner, config.repo, config.branch, mediaName, image, isPrivate);
         return `<p><img src="${url}"></p>`;
       }));
       editor.chain().focus().insertContent(content.join('\n')).run();
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index 80fd9547..39dbd990 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -14,63 +14,167 @@ type FileChange = {
 };
 
 type FileOperation = {
-  type: 'add' | 'modify' | 'delete';
+  type: 'add' | 'modify' | 'delete' | 'rename';
   path: string;
+  newPath?: string;
   sha?: string;
   content?: string;
+  size?: number;
+  downloadUrl?: string;
+  commit?: {
+    sha: string;
+    timestamp: number;
+  };
 };
 
+type CacheContext = 'collection' | 'media';
+
 // Bulk update cache entries (removed, modified and added files).
-const updateCache = async (
+const updateMultipleFilesCache = async (
   owner: string,
   repo: string,
   branch: string,
   removedFiles: Array<{ path: string }>,
   modifiedFiles: Array<FileChange>,
   addedFiles: Array<FileChange>,
-  token: string
+  token: string,
+  commit?: { sha: string; timestamp: number }
 ) => {
-  // Get all unique parent paths for all operations
+  // Handle removed files first (we don't need context for these)
+  if (removedFiles.length > 0) {
+    await db.delete(cachedEntriesTable).where(
+      and(
+        eq(cachedEntriesTable.owner, owner),
+        eq(cachedEntriesTable.repo, repo),
+        eq(cachedEntriesTable.branch, branch),
+        inArray(cachedEntriesTable.path, removedFiles.map(f => f.path))
+      )
+    );
+  }
+  
+  // Now handle added/modified files
+  // Get all unique parent paths for add/modify operations
   const parentPaths = Array.from(new Set([
-    ...removedFiles.map(f => path.dirname(f.path)),
     ...modifiedFiles.map(f => path.dirname(f.path)),
     ...addedFiles.map(f => path.dirname(f.path))
   ]));
   
-  const entries = await db.query.cachedEntriesTable.findMany({
+  if (parentPaths.length === 0) return; // Nothing to add or modify
+  
+  // Create a map to store context information for each parent path
+  const pathContextMap = new Map<string, CacheContext>();
+  
+  // First try to find collection contexts (preferred)
+  const collectionEntries = await db.query.cachedEntriesTable.findMany({
     where: and(
+      eq(cachedEntriesTable.context, 'collection'),
       eq(cachedEntriesTable.owner, owner),
       eq(cachedEntriesTable.repo, repo),
       eq(cachedEntriesTable.branch, branch),
       inArray(cachedEntriesTable.parentPath, parentPaths)
     )
   });
-
-  const cachedParentPaths = parentPaths.length > 0 ? 
-    Array.from(new Set(entries.map(e => e.parentPath))) : [];
-
-  // Only process files in cached directories
-  const filesToRemove = removedFiles.filter(file => 
-    cachedParentPaths.includes(path.dirname(file.path))
-  );
-
-  const filesToFetch = [
-    ...modifiedFiles.filter(file => cachedParentPaths.includes(path.dirname(file.path))),
-    ...addedFiles.filter(file => cachedParentPaths.includes(path.dirname(file.path)))
-  ];
-
-  // Delete removed files (only if in cached directories)
-  if (filesToRemove.length > 0) {
-    await db.delete(cachedEntriesTable).where(
-      and(
+  
+  // Map parent paths to collection context
+  for (const entry of collectionEntries) {
+    if (!pathContextMap.has(entry.parentPath)) {
+      pathContextMap.set(entry.parentPath, 'collection');
+    }
+  }
+  
+  // For any remaining parent paths, check for media context
+  const remainingPaths = parentPaths.filter(path => !pathContextMap.has(path));
+  
+  if (remainingPaths.length > 0) {
+    const mediaEntries = await db.query.cachedEntriesTable.findMany({
+      where: and(
+        eq(cachedEntriesTable.context, 'media'),
         eq(cachedEntriesTable.owner, owner),
         eq(cachedEntriesTable.repo, repo),
         eq(cachedEntriesTable.branch, branch),
-        inArray(cachedEntriesTable.path, filesToRemove.map(f => f.path))
+        inArray(cachedEntriesTable.parentPath, remainingPaths)
       )
-    );
+    });
+    
+    // Map parent paths to media context
+    for (const entry of mediaEntries) {
+      if (!pathContextMap.has(entry.parentPath)) {
+        pathContextMap.set(entry.parentPath, 'media');
+      }
+    }
+  }
+
+  // If we have commit info, check existing entries to avoid unnecessary processing
+  let existingEntries: any[] = [];
+  if (commit) {
+    const allPaths = [...modifiedFiles.map(f => f.path), ...addedFiles.map(f => f.path)];
+    
+    if (allPaths.length > 0) {
+      existingEntries = await db.query.cachedEntriesTable.findMany({
+        where: and(
+          eq(cachedEntriesTable.owner, owner),
+          eq(cachedEntriesTable.repo, repo),
+          eq(cachedEntriesTable.branch, branch),
+          inArray(cachedEntriesTable.path, allPaths)
+        )
+      });
+    }
   }
 
+  // Filter files to only those with parent paths in our cache
+  // AND if we have commit info, only those that need updating
+  const modifiedFilesToProcess = modifiedFiles.filter(file => {
+    const parentPath = path.dirname(file.path);
+    const hasContext = pathContextMap.has(parentPath);
+    
+    if (!hasContext) return false;
+    
+    // If no commit info, always process
+    if (!commit) return true;
+    
+    // Check if we need to process this file
+    const existingEntry = existingEntries.find(e => e.path === file.path);
+    
+    // If no existing entry, we need to process it
+    if (!existingEntry) return true;
+    
+    // If we have a newer version based on timestamp, skip
+    if (existingEntry.commitTimestamp && 
+        existingEntry.commitTimestamp > commit.timestamp) {
+      return false;
+    }
+    
+    // If timestamps are equal, check commit SHA
+    if (existingEntry.commitTimestamp === commit.timestamp &&
+        existingEntry.commitSha === commit.sha) {
+      return false;
+    }
+    
+    return true;
+  });
+  
+  const addedFilesToProcess = addedFiles.filter(file => {
+    const parentPath = path.dirname(file.path);
+    const hasContext = pathContextMap.has(parentPath);
+    
+    if (!hasContext) return false;
+    
+    // For added files with commit info, check if they already exist
+    if (commit) {
+      const existingEntry = existingEntries.find(e => e.path === file.path);
+      
+      // If it exists and we have a newer or same version, skip
+      if (existingEntry && existingEntry.commitTimestamp && 
+          existingEntry.commitTimestamp >= commit.timestamp) {
+        return false;
+      }
+    }
+    
+    return true;
+  });
+
+  const filesToFetch = [...modifiedFilesToProcess, ...addedFilesToProcess];
+  
   if (filesToFetch.length === 0) return;
 
   // Fetch content for all files in a single GraphQL query
@@ -84,6 +188,7 @@ const updateCache = async (
             ... on Blob {
               text
               oid
+              byteSize
             }
           }
         `).join('\n')}
@@ -101,54 +206,86 @@ const updateCache = async (
 
   const response: any = await octokit.graphql(query, variables);
 
-  // Process the results
-  const updates = filesToFetch.map((file, index) => {
-    const fileData = response.repository[`file${index}`];
-    return {
-      path: file.path,
-      parentPath: path.dirname(file.path),
-      content: fileData.text,
-      sha: fileData.oid,
-      lastUpdated: Date.now()
-    };
-  });
+  // Process the results and separate into updates and inserts
+  const entriesToUpdate = [];
+  const entriesToInsert = [];
 
-  // Batch update the cache
-  for (const update of updates) {
-    const isModified = modifiedFiles.some(f => f.path === update.path);
+  for (let i = 0; i < filesToFetch.length; i++) {
+    const file = filesToFetch[i];
+    const fileData = response.repository[`file${i}`];
+    const parentPath = path.dirname(file.path);
+    const context = pathContextMap.get(parentPath)!; // We know this exists because of our filter
+    
+    const isModified = modifiedFiles.some(f => f.path === file.path);
     
     if (isModified) {
-      // Update existing entry
-      await db.update(cachedEntriesTable)
+      entriesToUpdate.push({
+        context,
+        owner,
+        repo,
+        branch,
+        path: file.path,
+        content: fileData.text,
+        sha: fileData.oid,
+        size: fileData.byteSize,
+        downloadUrl: null,
+        lastUpdated: Date.now(),
+        ...(commit ? {
+          commitSha: commit.sha,
+          commitTimestamp: commit.timestamp
+        } : {})
+      });
+    } else {
+      entriesToInsert.push({
+        context,
+        owner,
+        repo,
+        branch,
+        path: file.path,
+        parentPath,
+        name: path.basename(file.path),
+        type: 'blob',
+        content: fileData.text,
+        sha: fileData.oid,
+        size: fileData.byteSize,
+        downloadUrl: null,
+        lastUpdated: Date.now(),
+        ...(commit ? {
+          commitSha: commit.sha,
+          commitTimestamp: commit.timestamp
+        } : {})
+      });
+    }
+  }
+
+  // Batch update modified entries
+  if (entriesToUpdate.length > 0) {
+    await Promise.all(entriesToUpdate.map(entry => 
+      db.update(cachedEntriesTable)
         .set({
-          content: update.content,
-          sha: update.sha,
-          lastUpdated: update.lastUpdated
+          content: entry.content,
+          sha: entry.sha,
+          size: entry.size,
+          downloadUrl: entry.downloadUrl,
+          lastUpdated: entry.lastUpdated,
+          ...(entry.commitSha ? { commitSha: entry.commitSha } : {}),
+          ...(entry.commitTimestamp ? { commitTimestamp: entry.commitTimestamp } : {})
         })
         .where(
           and(
-            eq(cachedEntriesTable.owner, owner),
-            eq(cachedEntriesTable.repo, repo),
-            eq(cachedEntriesTable.branch, branch),
-            eq(cachedEntriesTable.path, update.path)
+            eq(cachedEntriesTable.context, entry.context),
+            eq(cachedEntriesTable.owner, entry.owner),
+            eq(cachedEntriesTable.repo, entry.repo),
+            eq(cachedEntriesTable.branch, entry.branch),
+            eq(cachedEntriesTable.path, entry.path)
           )
-        );
-    } else {
-      // Insert new entry
-      await db.insert(cachedEntriesTable)
-        .values({
-          owner,
-          repo,
-          branch,
-          path: update.path,
-          parentPath: update.parentPath,
-          name: path.basename(update.path),
-          type: 'blob',
-          content: update.content,
-          sha: update.sha,
-          lastUpdated: update.lastUpdated
-        });
-    }
+        )
+    ));
+  }
+
+  // Batch insert new entries
+  if (entriesToInsert.length > 0) {
+    await db.insert(cachedEntriesTable).values(entriesToInsert);
   }
 }
 
@@ -160,6 +297,7 @@ const getCachedCollection = async (
   path: string,
   token: string
 ) => {
+  // Check the cache (no context as we may invalidate media cache)
   let entries = await db.query.cachedEntriesTable.findMany({
     where: and(
       eq(cachedEntriesTable.owner, owner),
@@ -169,8 +307,21 @@ const getCachedCollection = async (
     )
   });
 
-  if (entries.length === 0) {
-    // No cache hit, fetch from GitHub
+  if (entries.length === 0 || entries[0].context === 'media') {
+    if (entries[0].context === 'media') {
+      // Drop the media context cache and override it 
+      await db.delete(cachedEntriesTable).where(
+        and(
+        eq(cachedEntriesTable.owner, owner),
+        eq(cachedEntriesTable.repo, repo),
+        eq(cachedEntriesTable.branch, branch),
+        eq(cachedEntriesTable.parentPath, path),
+        eq(cachedEntriesTable.context, 'media')
+        )
+      );
+    }
+    
+    // Fetch from GitHub to create the collection cache
     const octokit = createOctokitInstance(token);
     const query = `
       query ($owner: String!, $repo: String!, $expression: String!) {
@@ -185,6 +336,7 @@ const getCachedCollection = async (
                   ... on Blob {
                     text
                     oid
+                    byteSize
                   }
                 }
               }
@@ -199,22 +351,25 @@ const getCachedCollection = async (
       repo: repo,
       expression
     });
-    // TODO: handle 401 / Bad credentials error
-
+    
     let githubEntries = response.repository?.object?.entries || [];
 
     if (githubEntries.length > 0) {
+      // We populate the cache
       entries = await db.insert(cachedEntriesTable)
         .values(githubEntries.map((entry: any) => ({
-          owner: owner,
-          repo: repo,
-          branch: branch,
+          context: 'collection',
+          owner,
+          repo,
+          branch,
           parentPath: path,
           name: entry.name,
           path: entry.path,
           type: entry.type,
           content: entry.type === "blob" ? entry.object.text : null,
           sha: entry.type === "blob" ? entry.object.oid : null,
+          size: entry.type === "blob" ? entry.object.byteSize : null,
+          downloadUrl: null, // GraphQL doesn't return download URLs (and we don't need it for collections)
           lastUpdated: Date.now()
         })))
         .returning();
@@ -226,6 +381,7 @@ const getCachedCollection = async (
 
 // Update the cache for an individual file (add, modify and delete).
 const updateFileCache = async (
+  context: CacheContext,
   owner: string,
   repo: string,
   branch: string,
@@ -252,29 +408,23 @@ const updateFileCache = async (
         throw new Error('Content and SHA are required for add/modify operations');
       }
 
-      const entry = {
-        owner,
-        repo,
-        branch,
-        path: operation.path,
-        parentPath,
-        name: path.basename(operation.path),
-        type: 'blob',
-        content: operation.content,
-        sha: operation.sha,
-        lastUpdated: Date.now()
-      };
-
       if (operation.type === 'modify') {
         // We always update entries in the cache if they are already present
         await db.update(cachedEntriesTable)
           .set({
-            content: entry.content,
-            sha: entry.sha,
-            lastUpdated: entry.lastUpdated
+            content: operation.content,
+            sha: operation.sha,
+            size: operation.size,
+            downloadUrl: operation.downloadUrl,
+            lastUpdated: Date.now(),
+            ...(operation.commit ? {
+              commitSha: operation.commit.sha,
+              commitTimestamp: operation.commit.timestamp
+            } : {})
           })
           .where(
             and(
+              eq(cachedEntriesTable.context, context),
               eq(cachedEntriesTable.owner, owner),
               eq(cachedEntriesTable.repo, repo),
               eq(cachedEntriesTable.branch, branch),
@@ -282,12 +432,12 @@ const updateFileCache = async (
             )
           );
       } else {
-        // We only cache collections (and maybe media folders later on). When a
-        // file is added, we only add it to the cache if there are already existing
-        // entries with the same parent path (meaning getCachedCollection (or
-        // getCachedMedia once we have media) has already been called on this path).
+        // We only cache collections and media folders. We only add files that already
+        // have siblings in the cache. If not we can assume the collection or media
+        // folder hasn't been cached yet, so we skip to avoid caching a single file.
         const sibling = await db.query.cachedEntriesTable.findFirst({
           where: and(
+            eq(cachedEntriesTable.context, context),
             eq(cachedEntriesTable.owner, owner),
             eq(cachedEntriesTable.repo, repo),
             eq(cachedEntriesTable.branch, branch),
@@ -296,11 +446,127 @@ const updateFileCache = async (
         });
 
         if (sibling) {
-          await db.insert(cachedEntriesTable).values(entry);
+          await db.insert(cachedEntriesTable)
+            .values({
+              context,
+              owner,
+              repo,
+              branch,
+              path: operation.path,
+              parentPath,
+              name: path.basename(operation.path),
+              type: 'blob',
+              content: operation.content,
+              sha: operation.sha,
+              size: operation.size,
+              downloadUrl: operation.downloadUrl,
+              lastUpdated: Date.now(),
+              ...(operation.commit ? {
+                commitSha: operation.commit.sha,
+                commitTimestamp: operation.commit.timestamp
+              } : {})
+            });
         }
       }
       break;
+
+    case 'rename':
+      if (!operation.newPath) {
+        throw new Error('newPath is required for rename operations');
+      }
+      
+      await db.update(cachedEntriesTable)
+        .set({
+          path: operation.newPath,
+          parentPath: path.dirname(operation.newPath),
+          name: path.basename(operation.newPath),
+          downloadUrl: null, // Reset download URL as it will change with the new path
+          lastUpdated: Date.now(),
+          ...(operation.commit ? {
+            commitSha: operation.commit.sha,
+            commitTimestamp: operation.commit.timestamp
+          } : {})
+        })
+        .where(
+          and(
+            eq(cachedEntriesTable.owner, owner),
+            eq(cachedEntriesTable.repo, repo),
+            eq(cachedEntriesTable.branch, branch),
+            eq(cachedEntriesTable.path, operation.path)
+          )
+        );
+      break;
   }
 };
 
-export { updateCache, getCachedCollection, updateFileCache };
\ No newline at end of file
+// Attempt to get a media folder from cache, if not found, fetch from GitHub.
+const getCachedMediaFolder = async (
+  owner: string,
+  repo: string,
+  branch: string,
+  path: string,
+  token: string,
+  nocache?: boolean
+) => {
+  let entries: any[] = [];
+
+  if (!nocache) {
+    // Check for entries from either context
+    entries = await db.query.cachedEntriesTable.findMany({
+      where: and(
+        eq(cachedEntriesTable.owner, owner),
+        eq(cachedEntriesTable.repo, repo),
+        eq(cachedEntriesTable.branch, branch),
+        eq(cachedEntriesTable.parentPath, path)
+      )
+    });
+  }
+
+  if (entries.length === 0) {  
+    // No cache hit, fetch from GitHub
+    const octokit = createOctokitInstance(token);
+    const response = await octokit.rest.repos.getContent({
+      owner: owner,
+      repo: repo,
+      path: path,
+      ref: branch,
+    });
+
+    if (!Array.isArray(response.data)) throw new Error("Expected a directory but found a file.");
+
+    const githubEntries = response.data;
+    
+    const mappedEntries = githubEntries.map(entry => ({
+      context: 'media' as CacheContext,
+      owner,
+      repo,
+      branch,
+      parentPath: path,
+      name: entry.name,
+      path: entry.path,
+      type: entry.type === "file" ? "blob" : "tree",
+      content: null,
+      sha: entry.sha,
+      size: entry.size || null,
+      downloadUrl: entry.download_url || null,
+      lastUpdated: Date.now(),
+      commitSha: null,
+      commitTimestamp: null
+    }));
+
+    if (!nocache && githubEntries.length > 0) {
+      // Cache the entries
+      entries = await db.insert(cachedEntriesTable)
+        .values(mappedEntries)
+        .returning();
+    } else {
+      // When `nocache`, we don't cache the entries (used by ./lib/githubImage.ts
+      // to get fresh download_url from GitHub and avoid hammering the cache table).
+      entries = mappedEntries;
+    }
+  }
+
+  return entries;
+};
+
+export { updateMultipleFilesCache, getCachedCollection, updateFileCache, getCachedMediaFolder };
\ No newline at end of file
diff --git a/lib/githubImage.ts b/lib/githubImage.ts
index fcc485e3..919c53d4 100644
--- a/lib/githubImage.ts
+++ b/lib/githubImage.ts
@@ -1,8 +1,7 @@
 /**
  * Helper functions to translate relative paths into publicly accessible GitHub
- * raw.githubusercontent.com URLs (with some light caching). This is especially
- * useful for images in private repositories since we can only access them via
- * a temporary URL provided by the GitHub API.
+ * raw.githubusercontent.com URLs (required for images in private repositories).
+ * Runs client-side with some temporary caching.
  */
 
 import { getFileName, getParentPath } from "@/lib/utils/file";
@@ -35,6 +34,7 @@ const getRawUrl = async (
   owner: string,
   repo: string,
   branch: string,
+  name: string,
   path: string,
   isPrivate = false,
   decode = false
@@ -52,7 +52,7 @@ const getRawUrl = async (
       delete cache[parentFullPath];
       
       if (!requests[parentFullPath]) {
-        requests[parentFullPath] = fetch(`/api/${owner}/${repo}/${encodeURIComponent(branch)}/media/${encodeURIComponent(parentPath)}`)
+        requests[parentFullPath] = fetch(`/api/${owner}/${repo}/${encodeURIComponent(branch)}/media/${encodeURIComponent(name)}/${encodeURIComponent(parentPath)}?nocache=true`)
           .then(response => {
             if (!response.ok) throw new Error(`Failed to fetch media: ${response.status} ${response.statusText}`);
             
@@ -114,6 +114,7 @@ const relativeToRawUrls = async (
   owner: string,
   repo: string,
   branch: string,
+  name: string,
   html: string,
   isPrivate = false,
   decode = false
@@ -127,7 +128,7 @@ const relativeToRawUrls = async (
 
     if (!src.startsWith("/") && !src.startsWith("http://") && !src.startsWith("https://") && !src.startsWith("data:image/")) {  
       // TODO: what does the function returns if it fails?
-      const rawUrl = await getRawUrl(owner, repo, branch, src, isPrivate, true);
+      const rawUrl = await getRawUrl(owner, repo, branch, name, src, isPrivate, true);
       if (rawUrl) {
         newHtml = newHtml.replace(`src=${quote}${src}${quote}`, `src=${quote}${rawUrl}${quote}`);
       }

From 12188f4fa562aa3f4a5f60fb21a846d6a8f67028 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 17 Mar 2025 22:05:05 +0800
Subject: [PATCH 41/95] Refined cache strategy

---
 .../[branch]/media/[name]/[path]/route.ts     | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts

diff --git a/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
new file mode 100644
index 00000000..01af6622
--- /dev/null
+++ b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
@@ -0,0 +1,99 @@
+import { createOctokitInstance } from "@/lib/utils/octokit";
+import { getConfig } from "@/lib/utils/config";
+import { getFileExtension, normalizePath } from "@/lib/utils/file";
+import { getAuth } from "@/lib/auth";
+import { getToken } from "@/lib/token";
+import { getCachedMediaFolder } from "@/lib/githubCache";
+
+// Add docs
+
+/**
+ * Get the list of media files in a directory.
+ *
+ * GET /api/[owner]/[repo]/[branch]/media/[path]
+ * 
+ * Requires authentication.
+ */
+
+export async function GET(
+  request: Request,
+  { params }: { params: { owner: string, repo: string, branch: string, name: string, path: string } }
+) {
+  try {
+    const { user, session } = await getAuth();
+    if (!session) return new Response(null, { status: 401 });
+
+    const token = await getToken(user, params.owner, params.repo);
+    if (!token) throw new Error("Token not found");
+
+    const config = await getConfig(params.owner, params.repo, params.branch);
+    if (!config) throw new Error(`Configuration not found for ${params.owner}/${params.repo}/${params.branch}.`);   
+    
+    const mediaConfig = config.object.media.find((item: any) => item.name === params.name) || config.object.media[0];
+
+    if (!mediaConfig) {
+      if (params.name) throw new Error(`No media configuration named "${params.name}" found for ${params.owner}/${params.repo}/${params.branch}.`);
+      throw new Error(`No media configuration found for ${params.owner}/${params.repo}/${params.branch}.`);
+    }
+
+    const normalizedPath = normalizePath(params.path);
+    if (!normalizedPath.startsWith(mediaConfig.input)) throw new Error(`Invalid path "${params.path}" for media.`);
+
+    const { searchParams } = new URL(request.url);
+    const nocache = searchParams.get('nocache');
+
+    let results = await getCachedMediaFolder(params.owner, params.repo, params.branch, params.name, normalizedPath, nocache);
+
+    // const octokit = createOctokitInstance(token);
+    // const response = await octokit.rest.repos.getContent({
+    //   owner: params.owner,
+    //   repo: params.repo,
+    //   path: normalizedPath,
+    //   ref: params.branch,
+    // });
+
+    // if (!Array.isArray(response.data)) {
+    //   throw new Error("Expected a directory but found a file.");
+    // }
+
+    // let results = response.data;
+
+    if (mediaConfig.extensions && mediaConfig.extensions.length > 0) {
+      results = results.filter((item) => {
+        if (item.type === "dir") return true;
+        const extension = getFileExtension(item.name);
+        return mediaConfig.extensions.includes(extension);
+      });
+    }
+
+    results.sort((a: any, b: any) => {
+      if (a.type === b.type) {
+        return a.name.localeCompare(b.name);
+      } else {
+        return a.type === "dir" ? -1 : 1;
+      }
+    });
+
+    return Response.json({
+      status: "success",
+      data: results.map((item: any) => {
+        return {
+          type: item.type,
+          sha: item.sha,
+          name: item.name,
+          path: item.path,
+          extension: item.type === "dir" ? undefined : getFileExtension(item.name),
+          size: item.size,
+          url: item.download_url
+        };
+      }),
+    });
+  } catch (error: any) {
+    console.error(error);
+    // TODO: better handling of GitHub errors
+    return Response.json({
+      status: "error",
+      message: error.status === 404 ? "Not found" : error.message,
+    });
+  }
+}
\ No newline at end of file

From d722b29d29ce50a1ad07cc251647254c4c057298 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 17 Mar 2025 23:17:13 +0800
Subject: [PATCH 42/95] Fixing error with githubImage

---
 .../[owner]/[repo]/[branch]/media/[name]/[path]/route.ts   | 4 ++--
 db/migrations/0002_late_big_bertha.sql                     | 5 +++++
 db/migrations/meta/_journal.json                           | 7 +++++++
 lib/githubCache.ts                                         | 6 ++++--
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 db/migrations/0002_late_big_bertha.sql

diff --git a/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
index 01af6622..c88a779e 100644
--- a/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
@@ -42,7 +42,7 @@ export async function GET(
     const { searchParams } = new URL(request.url);
     const nocache = searchParams.get('nocache');
 
-    let results = await getCachedMediaFolder(params.owner, params.repo, params.branch, params.name, normalizedPath, nocache);
+    let results = await getCachedMediaFolder(params.owner, params.repo, params.branch, normalizedPath, token, !!nocache);
 
     // const octokit = createOctokitInstance(token);
     // const response = await octokit.rest.repos.getContent({
@@ -84,7 +84,7 @@ export async function GET(
           path: item.path,
           extension: item.type === "dir" ? undefined : getFileExtension(item.name),
           size: item.size,
-          url: item.download_url
+          url: item.downloadUrl
         };
       }),
     });
diff --git a/db/migrations/0002_late_big_bertha.sql b/db/migrations/0002_late_big_bertha.sql
new file mode 100644
index 00000000..df5e88d8
--- /dev/null
+++ b/db/migrations/0002_late_big_bertha.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `cached_entries` ADD `context` text DEFAULT 'collection' NOT NULL;--> statement-breakpoint
+ALTER TABLE `cached_entries` ADD `size` integer;--> statement-breakpoint
+ALTER TABLE `cached_entries` ADD `download_url` text;--> statement-breakpoint
+ALTER TABLE `cached_entries` ADD `commit_sha` text;--> statement-breakpoint
+ALTER TABLE `cached_entries` ADD `commit_timestamp` integer;
\ No newline at end of file
diff --git a/db/migrations/meta/_journal.json b/db/migrations/meta/_journal.json
index d0d5c7b5..fb29a8b0 100644
--- a/db/migrations/meta/_journal.json
+++ b/db/migrations/meta/_journal.json
@@ -15,6 +15,13 @@
       "when": 1741784806486,
       "tag": "0001_brief_mesmero",
       "breakpoints": true
+    },
+    {
+      "idx": 2,
+      "version": "6",
+      "when": 1742220477158,
+      "tag": "0002_late_big_bertha",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index 39dbd990..cac9b478 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -307,8 +307,8 @@ const getCachedCollection = async (
     )
   });
 
-  if (entries.length === 0 || entries[0].context === 'media') {
-    if (entries[0].context === 'media') {
+  if (entries.length === 0 || (entries.length > 0 && entries[0].context === 'media')) {
+    if (entries.length > 0 && entries[0].context === 'media') {
       // Drop the media context cache and override it 
       await db.delete(cachedEntriesTable).where(
         and(
@@ -387,6 +387,7 @@ const updateFileCache = async (
   branch: string,
   operation: FileOperation
 ) => {
+  // console.log('updateFileCache', context, owner, repo, branch, operation);
   const parentPath = path.dirname(operation.path);
 
   switch (operation.type) {
@@ -499,6 +500,7 @@ const updateFileCache = async (
   }
 };
 
+// TODO: NO MEDIA NAME???
 // Attempt to get a media folder from cache, if not found, fetch from GitHub.
 const getCachedMediaFolder = async (
   owner: string,

From 0f6c575792b0584054dee681ca62d69628106133 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 17 Mar 2025 23:18:28 +0800
Subject: [PATCH 43/95] Adding migration snapshot

---
 db/migrations/meta/0002_snapshot.json | 618 ++++++++++++++++++++++++++
 1 file changed, 618 insertions(+)
 create mode 100644 db/migrations/meta/0002_snapshot.json

diff --git a/db/migrations/meta/0002_snapshot.json b/db/migrations/meta/0002_snapshot.json
new file mode 100644
index 00000000..61c83170
--- /dev/null
+++ b/db/migrations/meta/0002_snapshot.json
@@ -0,0 +1,618 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "ea2e950d-37e0-43d2-865d-9f13e48ed379",
+  "prevId": "86214e27-a7c3-4087-8050-6fc55560872a",
+  "tables": {
+    "cached_entries": {
+      "name": "cached_entries",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "context": {
+          "name": "context",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'collection'"
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "parent_path": {
+          "name": "parent_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sha": {
+          "name": "sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "download_url": {
+          "name": "download_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "commit_sha": {
+          "name": "commit_sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "commit_timestamp": {
+          "name": "commit_timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_updated": {
+          "name": "last_updated",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "collaborator": {
+      "name": "collaborator",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "installation_id": {
+          "name": "installation_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner_id": {
+          "name": "owner_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo_id": {
+          "name": "repo_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "collaborator_user_id_user_id_fk": {
+          "name": "collaborator_user_id_user_id_fk",
+          "tableFrom": "collaborator",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "collaborator_invited_by_user_id_fk": {
+          "name": "collaborator_invited_by_user_id_fk",
+          "tableFrom": "collaborator",
+          "tableTo": "user",
+          "columnsFrom": [
+            "invited_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "config": {
+      "name": "config",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sha": {
+          "name": "sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "object": {
+          "name": "object",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "email_login_token": {
+      "name": "email_login_token",
+      "columns": {
+        "token_hash": {
+          "name": "token_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "email_login_token_token_hash_unique": {
+          "name": "email_login_token_token_hash_unique",
+          "columns": [
+            "token_hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "github_installation_token": {
+      "name": "github_installation_token",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "ciphertext": {
+          "name": "ciphertext",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iv": {
+          "name": "iv",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "installation_id": {
+          "name": "installation_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "github_user_token": {
+      "name": "github_user_token",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "ciphertext": {
+          "name": "ciphertext",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iv": {
+          "name": "iv",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "github_user_token_user_id_user_id_fk": {
+          "name": "github_user_token_user_id_user_id_fk",
+          "tableFrom": "github_user_token",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "history": {
+      "name": "history",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_visited": {
+          "name": "last_visited",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "history_user_id_user_id_fk": {
+          "name": "history_user_id_user_id_fk",
+          "tableFrom": "history",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "session": {
+      "name": "session",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_email": {
+          "name": "github_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_name": {
+          "name": "github_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_id": {
+          "name": "github_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_username": {
+          "name": "github_username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "user_github_id_unique": {
+          "name": "user_github_id_unique",
+          "columns": [
+            "github_id"
+          ],
+          "isUnique": true
+        },
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file

From e247ddbf32ea229244b0b0e0e6d00b5d7a26e027 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Mon, 17 Mar 2025 23:45:24 +0800
Subject: [PATCH 44/95] Fixing file caching

---
 app/api/[owner]/[repo]/[branch]/files/[path]/route.ts |  4 ++--
 components/media/media-dialog.tsx                     |  2 +-
 lib/githubCache.ts                                    | 10 +++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
index cf08f47c..7ad500a7 100644
--- a/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/files/[path]/route.ts
@@ -157,10 +157,10 @@ export async function POST(
       await updateConfig(newConfig);
     }
     
-    if (response?.data.content && response?.data.commit && data.type !== "media") {
+    if (response?.data.content && response?.data.commit) {
       // If the file is successfully saved, update the cache
       await updateFileCache(
-        data.type,
+        data.type === 'content' ? 'collection' : 'media',
         params.owner,
         params.repo,
         params.branch,
diff --git a/components/media/media-dialog.tsx b/components/media/media-dialog.tsx
index 83d236dc..1a3b56d7 100644
--- a/components/media/media-dialog.tsx
+++ b/components/media/media-dialog.tsx
@@ -73,7 +73,7 @@ const MediaDialog = forwardRef(({
         </DialogHeader>
         
         <MediaView name={configMedia.name} initialSelected={selected || []} onSelect={handleSelect} maxSelected={maxSelected} initialPath={initialPath || ""}/>
-        {config.object.media?.input &&
+        {configMedia.input &&
           <DialogFooter>
             <DialogClose asChild>
               <Button type="submit" onClick={handleSubmit}>Select</Button>
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index cac9b478..3c0047b0 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -7,6 +7,7 @@ import { eq, and, inArray } from "drizzle-orm";
 import { cachedEntriesTable } from "@/db/schema";
 import { createOctokitInstance } from "@/lib/utils/octokit";
 import path from "path";
+import { sql } from 'drizzle-orm';
 
 type FileChange = {
   path: string;
@@ -411,7 +412,8 @@ const updateFileCache = async (
 
       if (operation.type === 'modify') {
         // We always update entries in the cache if they are already present
-        await db.update(cachedEntriesTable)
+        
+        const query = db.update(cachedEntriesTable)
           .set({
             content: operation.content,
             sha: operation.sha,
@@ -432,6 +434,12 @@ const updateFileCache = async (
               eq(cachedEntriesTable.path, operation.path)
             )
           );
+
+        // Log the SQL query
+        console.log('SQL Query:', query.toSQL());
+
+        // Execute the query
+        await query;
       } else {
         // We only cache collections and media folders. We only add files that already
         // have siblings in the cache. If not we can assume the collection or media

From 1c8a1062b5f802f19a1d4e4ee7778e0d55d24aa0 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 18 Mar 2025 10:56:08 +0800
Subject: [PATCH 45/95] Cleaning up drizzle migrations, updating schema for
 cache (naming, indexes...) and refining caching strategy

---
 db/migrations/0001_brief_mesmero.sql         |  13 -
 db/migrations/0001_late_shinko_yamashiro.sql |  28 +
 db/migrations/0002_late_big_bertha.sql       |   5 -
 db/migrations/meta/0001_snapshot.json        | 137 +++-
 db/migrations/meta/0002_snapshot.json        | 618 -------------------
 db/migrations/meta/_journal.json             |  27 -
 db/schema.ts                                 |  36 +-
 lib/githubCache.ts                           | 398 +++++-------
 tsconfig.json                                |   1 +
 9 files changed, 336 insertions(+), 927 deletions(-)
 delete mode 100644 db/migrations/0001_brief_mesmero.sql
 create mode 100644 db/migrations/0001_late_shinko_yamashiro.sql
 delete mode 100644 db/migrations/0002_late_big_bertha.sql
 delete mode 100644 db/migrations/meta/0002_snapshot.json
 delete mode 100644 db/migrations/meta/_journal.json

diff --git a/db/migrations/0001_brief_mesmero.sql b/db/migrations/0001_brief_mesmero.sql
deleted file mode 100644
index d9ca79f3..00000000
--- a/db/migrations/0001_brief_mesmero.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-CREATE TABLE `cached_entries` (
-	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`owner` text NOT NULL,
-	`repo` text NOT NULL,
-	`branch` text NOT NULL,
-	`parent_path` text NOT NULL,
-	`name` text NOT NULL,
-	`path` text NOT NULL,
-	`type` text NOT NULL,
-	`content` text,
-	`sha` text,
-	`last_updated` integer NOT NULL
-);
diff --git a/db/migrations/0001_late_shinko_yamashiro.sql b/db/migrations/0001_late_shinko_yamashiro.sql
new file mode 100644
index 00000000..b9eee66a
--- /dev/null
+++ b/db/migrations/0001_late_shinko_yamashiro.sql
@@ -0,0 +1,28 @@
+CREATE TABLE `cache` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`context` text DEFAULT 'collection' NOT NULL,
+	`owner` text NOT NULL,
+	`repo` text NOT NULL,
+	`branch` text NOT NULL,
+	`parent_path` text NOT NULL,
+	`name` text NOT NULL,
+	`path` text NOT NULL,
+	`type` text NOT NULL,
+	`content` text,
+	`sha` text,
+	`size` integer,
+	`download_url` text,
+	`commit_sha` text,
+	`commit_timestamp` integer,
+	`last_updated` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE INDEX `idx_cache_owner_repo_branch_parentPath` ON `cache` (`owner`,`repo`,`branch`,`parent_path`);--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_cache_owner_repo_branch_path` ON `cache` (`owner`,`repo`,`branch`,`path`);--> statement-breakpoint
+CREATE INDEX `idx_collaborator_owner_repo_email` ON `collaborator` (`owner`,`repo`,`email`);--> statement-breakpoint
+CREATE INDEX `idx_collaborator_userId` ON `collaborator` (`user_id`);--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_config_owner_repo_branch` ON `config` (`owner`,`repo`,`branch`);--> statement-breakpoint
+CREATE INDEX `idx_github_installation_token_installationId` ON `github_installation_token` (`installation_id`);--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_github_user_token_userId` ON `github_user_token` (`user_id`);--> statement-breakpoint
+CREATE INDEX `idx_history_userId_lastVisited` ON `history` (`user_id`,`last_visited`);--> statement-breakpoint
+CREATE INDEX `idx_session_userId` ON `session` (`user_id`);
\ No newline at end of file
diff --git a/db/migrations/0002_late_big_bertha.sql b/db/migrations/0002_late_big_bertha.sql
deleted file mode 100644
index df5e88d8..00000000
--- a/db/migrations/0002_late_big_bertha.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `cached_entries` ADD `context` text DEFAULT 'collection' NOT NULL;--> statement-breakpoint
-ALTER TABLE `cached_entries` ADD `size` integer;--> statement-breakpoint
-ALTER TABLE `cached_entries` ADD `download_url` text;--> statement-breakpoint
-ALTER TABLE `cached_entries` ADD `commit_sha` text;--> statement-breakpoint
-ALTER TABLE `cached_entries` ADD `commit_timestamp` integer;
\ No newline at end of file
diff --git a/db/migrations/meta/0001_snapshot.json b/db/migrations/meta/0001_snapshot.json
index bea7effd..ac5d7739 100644
--- a/db/migrations/meta/0001_snapshot.json
+++ b/db/migrations/meta/0001_snapshot.json
@@ -1,11 +1,11 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "86214e27-a7c3-4087-8050-6fc55560872a",
+  "id": "9d186c64-ed0f-408e-ad44-a04dad063523",
   "prevId": "9bebad23-d902-47ff-b6e6-8878fb0c5b3e",
   "tables": {
-    "cached_entries": {
-      "name": "cached_entries",
+    "cache": {
+      "name": "cache",
       "columns": {
         "id": {
           "name": "id",
@@ -14,6 +14,14 @@
           "notNull": true,
           "autoincrement": true
         },
+        "context": {
+          "name": "context",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'collection'"
+        },
         "owner": {
           "name": "owner",
           "type": "text",
@@ -77,6 +85,34 @@
           "notNull": false,
           "autoincrement": false
         },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "download_url": {
+          "name": "download_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "commit_sha": {
+          "name": "commit_sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "commit_timestamp": {
+          "name": "commit_timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
         "last_updated": {
           "name": "last_updated",
           "type": "integer",
@@ -85,7 +121,28 @@
           "autoincrement": false
         }
       },
-      "indexes": {},
+      "indexes": {
+        "idx_cache_owner_repo_branch_parentPath": {
+          "name": "idx_cache_owner_repo_branch_parentPath",
+          "columns": [
+            "owner",
+            "repo",
+            "branch",
+            "parent_path"
+          ],
+          "isUnique": false
+        },
+        "idx_cache_owner_repo_branch_path": {
+          "name": "idx_cache_owner_repo_branch_path",
+          "columns": [
+            "owner",
+            "repo",
+            "branch",
+            "path"
+          ],
+          "isUnique": true
+        }
+      },
       "foreignKeys": {},
       "compositePrimaryKeys": {},
       "uniqueConstraints": {}
@@ -171,7 +228,24 @@
           "autoincrement": false
         }
       },
-      "indexes": {},
+      "indexes": {
+        "idx_collaborator_owner_repo_email": {
+          "name": "idx_collaborator_owner_repo_email",
+          "columns": [
+            "owner",
+            "repo",
+            "email"
+          ],
+          "isUnique": false
+        },
+        "idx_collaborator_userId": {
+          "name": "idx_collaborator_userId",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
       "foreignKeys": {
         "collaborator_user_id_user_id_fk": {
           "name": "collaborator_user_id_user_id_fk",
@@ -256,7 +330,17 @@
           "autoincrement": false
         }
       },
-      "indexes": {},
+      "indexes": {
+        "idx_config_owner_repo_branch": {
+          "name": "idx_config_owner_repo_branch",
+          "columns": [
+            "owner",
+            "repo",
+            "branch"
+          ],
+          "isUnique": true
+        }
+      },
       "foreignKeys": {},
       "compositePrimaryKeys": {},
       "uniqueConstraints": {}
@@ -338,7 +422,15 @@
           "autoincrement": false
         }
       },
-      "indexes": {},
+      "indexes": {
+        "idx_github_installation_token_installationId": {
+          "name": "idx_github_installation_token_installationId",
+          "columns": [
+            "installation_id"
+          ],
+          "isUnique": false
+        }
+      },
       "foreignKeys": {},
       "compositePrimaryKeys": {},
       "uniqueConstraints": {}
@@ -375,7 +467,15 @@
           "autoincrement": false
         }
       },
-      "indexes": {},
+      "indexes": {
+        "idx_github_user_token_userId": {
+          "name": "idx_github_user_token_userId",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
       "foreignKeys": {
         "github_user_token_user_id_user_id_fk": {
           "name": "github_user_token_user_id_user_id_fk",
@@ -440,7 +540,16 @@
           "autoincrement": false
         }
       },
-      "indexes": {},
+      "indexes": {
+        "idx_history_userId_lastVisited": {
+          "name": "idx_history_userId_lastVisited",
+          "columns": [
+            "user_id",
+            "last_visited"
+          ],
+          "isUnique": false
+        }
+      },
       "foreignKeys": {
         "history_user_id_user_id_fk": {
           "name": "history_user_id_user_id_fk",
@@ -484,7 +593,15 @@
           "autoincrement": false
         }
       },
-      "indexes": {},
+      "indexes": {
+        "idx_session_userId": {
+          "name": "idx_session_userId",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
       "foreignKeys": {
         "session_user_id_user_id_fk": {
           "name": "session_user_id_user_id_fk",
diff --git a/db/migrations/meta/0002_snapshot.json b/db/migrations/meta/0002_snapshot.json
deleted file mode 100644
index 61c83170..00000000
--- a/db/migrations/meta/0002_snapshot.json
+++ /dev/null
@@ -1,618 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "ea2e950d-37e0-43d2-865d-9f13e48ed379",
-  "prevId": "86214e27-a7c3-4087-8050-6fc55560872a",
-  "tables": {
-    "cached_entries": {
-      "name": "cached_entries",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "context": {
-          "name": "context",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'collection'"
-        },
-        "owner": {
-          "name": "owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo": {
-          "name": "repo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "parent_path": {
-          "name": "parent_path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "path": {
-          "name": "path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "content": {
-          "name": "content",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "sha": {
-          "name": "sha",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "size": {
-          "name": "size",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "download_url": {
-          "name": "download_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "commit_sha": {
-          "name": "commit_sha",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "commit_timestamp": {
-          "name": "commit_timestamp",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_updated": {
-          "name": "last_updated",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "collaborator": {
-      "name": "collaborator",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "installation_id": {
-          "name": "installation_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "owner_id": {
-          "name": "owner_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo_id": {
-          "name": "repo_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "owner": {
-          "name": "owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo": {
-          "name": "repo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "invited_by": {
-          "name": "invited_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "collaborator_user_id_user_id_fk": {
-          "name": "collaborator_user_id_user_id_fk",
-          "tableFrom": "collaborator",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "collaborator_invited_by_user_id_fk": {
-          "name": "collaborator_invited_by_user_id_fk",
-          "tableFrom": "collaborator",
-          "tableTo": "user",
-          "columnsFrom": [
-            "invited_by"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "config": {
-      "name": "config",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "owner": {
-          "name": "owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo": {
-          "name": "repo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "sha": {
-          "name": "sha",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "object": {
-          "name": "object",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "email_login_token": {
-      "name": "email_login_token",
-      "columns": {
-        "token_hash": {
-          "name": "token_hash",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "email_login_token_token_hash_unique": {
-          "name": "email_login_token_token_hash_unique",
-          "columns": [
-            "token_hash"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "github_installation_token": {
-      "name": "github_installation_token",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "ciphertext": {
-          "name": "ciphertext",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iv": {
-          "name": "iv",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "installation_id": {
-          "name": "installation_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "github_user_token": {
-      "name": "github_user_token",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "ciphertext": {
-          "name": "ciphertext",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iv": {
-          "name": "iv",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "github_user_token_user_id_user_id_fk": {
-          "name": "github_user_token_user_id_user_id_fk",
-          "tableFrom": "github_user_token",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "history": {
-      "name": "history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "owner": {
-          "name": "owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo": {
-          "name": "repo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "last_visited": {
-          "name": "last_visited",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "history_user_id_user_id_fk": {
-          "name": "history_user_id_user_id_fk",
-          "tableFrom": "history",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "session": {
-      "name": "session",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "session_user_id_user_id_fk": {
-          "name": "session_user_id_user_id_fk",
-          "tableFrom": "session",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "user": {
-      "name": "user",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "github_email": {
-          "name": "github_email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "github_name": {
-          "name": "github_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "github_id": {
-          "name": "github_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "github_username": {
-          "name": "github_username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "user_github_id_unique": {
-          "name": "user_github_id_unique",
-          "columns": [
-            "github_id"
-          ],
-          "isUnique": true
-        },
-        "user_email_unique": {
-          "name": "user_email_unique",
-          "columns": [
-            "email"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    }
-  },
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
\ No newline at end of file
diff --git a/db/migrations/meta/_journal.json b/db/migrations/meta/_journal.json
deleted file mode 100644
index fb29a8b0..00000000
--- a/db/migrations/meta/_journal.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "version": "7",
-  "dialect": "sqlite",
-  "entries": [
-    {
-      "idx": 0,
-      "version": "6",
-      "when": 1733392958887,
-      "tag": "0000_lame_dormammu",
-      "breakpoints": true
-    },
-    {
-      "idx": 1,
-      "version": "6",
-      "when": 1741784806486,
-      "tag": "0001_brief_mesmero",
-      "breakpoints": true
-    },
-    {
-      "idx": 2,
-      "version": "6",
-      "when": 1742220477158,
-      "tag": "0002_late_big_bertha",
-      "breakpoints": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/db/schema.ts b/db/schema.ts
index e3ec93a2..dbb9e72c 100644
--- a/db/schema.ts
+++ b/db/schema.ts
@@ -2,6 +2,8 @@ import {
   sqliteTable,
   text,
   integer,
+  index,
+  uniqueIndex
 } from "drizzle-orm/sqlite-core";
 
 const userTable = sqliteTable("user", {
@@ -17,7 +19,9 @@ const sessionTable = sqliteTable("session", {
   id: text("id").notNull().primaryKey(),
   expiresAt: integer("expires_at").notNull(),
   userId: text("user_id").notNull().references(() => userTable.id)
-});
+}, table => ({
+  idx_session_userId: index("idx_session_userId").on(table.userId)
+}));
 
 const historyTable = sqliteTable("history", {
   id: integer("id").primaryKey({ autoIncrement: true }),
@@ -26,14 +30,18 @@ const historyTable = sqliteTable("history", {
   branch: text("branch").notNull(),
   lastVisited: integer("last_visited").notNull(),
   userId: text("user_id").notNull().references(() => userTable.id)
-});
+}, table => ({
+  idx_history_userId_lastVisited: index("idx_history_userId_lastVisited").on(table.userId, table.lastVisited)
+}));
 
 const githubUserTokenTable = sqliteTable("github_user_token", {
   id: integer("id").primaryKey({ autoIncrement: true }),
   ciphertext: text("ciphertext").notNull(),
   iv: text("iv").notNull(),
   userId: text("user_id").notNull().references(() => userTable.id)
-});
+}, table => ({
+  idx_github_user_token_userId: uniqueIndex("idx_github_user_token_userId").on(table.userId)
+}));
 
 const githubInstallationTokenTable = sqliteTable("github_installation_token", {
   id: integer("id").primaryKey({ autoIncrement: true }),
@@ -41,7 +49,9 @@ const githubInstallationTokenTable = sqliteTable("github_installation_token", {
   iv: text("iv").notNull(),
   installationId: integer("installation_id").notNull(),
   expiresAt: integer("expires_at").notNull()
-});
+}, table => ({
+  idx_github_installation_token_installationId: index("idx_github_installation_token_installationId").on(table.installationId)
+}));
 
 const emailLoginTokenTable = sqliteTable("email_login_token", {
   tokenHash: text("token_hash").notNull().unique(),
@@ -62,7 +72,10 @@ const collaboratorTable = sqliteTable("collaborator", {
   userId: text("user_id").references(() => userTable.id),
   status: text("type"),
   invitedBy: text("invited_by").notNull().references(() => userTable.id)
-});
+}, table => ({
+  idx_collaborator_owner_repo_email: index("idx_collaborator_owner_repo_email").on(table.owner, table.repo, table.email),
+  idx_collaborator_userId: index("idx_collaborator_userId").on(table.userId)
+}));
 
 const configTable = sqliteTable("config", {
   id: integer("id").primaryKey({ autoIncrement: true }),
@@ -72,9 +85,11 @@ const configTable = sqliteTable("config", {
   sha: text("sha").notNull(),
   version: text("version").notNull(),
   object: text("object").notNull()
-});
+}, table => ({
+  idx_config_owner_repo_branch: uniqueIndex("idx_config_owner_repo_branch").on(table.owner, table.repo, table.branch)
+}));
 
-const cachedEntriesTable = sqliteTable("cached_entries", {
+const cacheTable = sqliteTable("cache", {
   id: integer("id").primaryKey({ autoIncrement: true }),
   context: text("context").notNull().default('collection'),
   owner: text("owner").notNull(),
@@ -91,7 +106,10 @@ const cachedEntriesTable = sqliteTable("cached_entries", {
   commitSha: text('commit_sha'),
   commitTimestamp: integer('commit_timestamp'),
   lastUpdated: integer("last_updated").notNull()
-});
+}, table => ({
+  idx_cache_owner_repo_branch_parentPath: index("idx_cache_owner_repo_branch_parentPath").on(table.owner, table.repo, table.branch, table.parentPath),
+  idx_cache_owner_repo_branch_path: uniqueIndex("idx_cache_owner_repo_branch_path").on(table.owner, table.repo, table.branch, table.path)
+}));
 
 export {
   userTable,
@@ -102,5 +120,5 @@ export {
   emailLoginTokenTable,
   collaboratorTable,
   configTable,
-  cachedEntriesTable
+  cacheTable
 };
\ No newline at end of file
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index 3c0047b0..7e8973a4 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -1,13 +1,12 @@
 /**
- * Herlper functions to manage the database cache.
+ * Helper functions to manage the database cache.
  */
 
 import { db } from "@/db";
 import { eq, and, inArray } from "drizzle-orm";
-import { cachedEntriesTable } from "@/db/schema";
+import { cacheTable } from "@/db/schema";
 import { createOctokitInstance } from "@/lib/utils/octokit";
 import path from "path";
-import { sql } from 'drizzle-orm';
 
 type FileChange = {
   path: string;
@@ -30,6 +29,7 @@ type FileOperation = {
 
 type CacheContext = 'collection' | 'media';
 
+// TODO: add pagination for very large repos.
 // Bulk update cache entries (removed, modified and added files).
 const updateMultipleFilesCache = async (
   owner: string,
@@ -41,203 +41,142 @@ const updateMultipleFilesCache = async (
   token: string,
   commit?: { sha: string; timestamp: number }
 ) => {
-  // Handle removed files first (we don't need context for these)
+  // 1. Delete removed files in batch
   if (removedFiles.length > 0) {
-    await db.delete(cachedEntriesTable).where(
+    await db.delete(cacheTable).where(
       and(
-        eq(cachedEntriesTable.owner, owner),
-        eq(cachedEntriesTable.repo, repo),
-        eq(cachedEntriesTable.branch, branch),
-        inArray(cachedEntriesTable.path, removedFiles.map(f => f.path))
+        eq(cacheTable.owner, owner),
+        eq(cacheTable.repo, repo),
+        eq(cacheTable.branch, branch),
+        inArray(cacheTable.path, removedFiles.map(f => f.path))
       )
     );
   }
-  
-  // Now handle added/modified files
-  // Get all unique parent paths for add/modify operations
+
+  // 2. Collect unique parent paths for added/modified files
   const parentPaths = Array.from(new Set([
     ...modifiedFiles.map(f => path.dirname(f.path)),
     ...addedFiles.map(f => path.dirname(f.path))
   ]));
-  
-  if (parentPaths.length === 0) return; // Nothing to add or modify
-  
-  // Create a map to store context information for each parent path
-  const pathContextMap = new Map<string, CacheContext>();
-  
-  // First try to find collection contexts (preferred)
-  const collectionEntries = await db.query.cachedEntriesTable.findMany({
+
+  if (parentPaths.length === 0) return;
+
+  // 3. Query existing contexts (combined single query)
+  const existingEntries = await db.query.cacheTable.findMany({
     where: and(
-      eq(cachedEntriesTable.context, 'collection'),
-      eq(cachedEntriesTable.owner, owner),
-      eq(cachedEntriesTable.repo, repo),
-      eq(cachedEntriesTable.branch, branch),
-      inArray(cachedEntriesTable.parentPath, parentPaths)
+      eq(cacheTable.owner, owner),
+      eq(cacheTable.repo, repo),
+      eq(cacheTable.branch, branch),
+      inArray(cacheTable.parentPath, parentPaths)
     )
   });
-  
-  // Map parent paths to collection context
-  for (const entry of collectionEntries) {
-    if (!pathContextMap.has(entry.parentPath)) {
+
+  // 4. Create parent path -> context map
+  const pathContextMap = new Map<string, CacheContext>();
+  for (const entry of existingEntries) {
+    if (entry.context === 'collection') {
       pathContextMap.set(entry.parentPath, 'collection');
+    } else if (!pathContextMap.has(entry.parentPath)) {
+      pathContextMap.set(entry.parentPath, 'media');
     }
   }
-  
-  // For any remaining parent paths, check for media context
-  const remainingPaths = parentPaths.filter(path => !pathContextMap.has(path));
-  
-  if (remainingPaths.length > 0) {
-    const mediaEntries = await db.query.cachedEntriesTable.findMany({
+
+  // 5. Query existing entries for modified/added files if commit provided
+  let existingFilesMap = new Map<string, typeof cacheTable.$inferSelect>();
+  if (commit) {
+    const allPaths = [...modifiedFiles, ...addedFiles].map(f => f.path);
+    const existingFiles = await db.query.cacheTable.findMany({
       where: and(
-        eq(cachedEntriesTable.context, 'media'),
-        eq(cachedEntriesTable.owner, owner),
-        eq(cachedEntriesTable.repo, repo),
-        eq(cachedEntriesTable.branch, branch),
-        inArray(cachedEntriesTable.parentPath, remainingPaths)
+        eq(cacheTable.owner, owner),
+        eq(cacheTable.repo, repo),
+        eq(cacheTable.branch, branch),
+        inArray(cacheTable.path, allPaths)
       )
     });
-    
-    // Map parent paths to media context
-    for (const entry of mediaEntries) {
-      if (!pathContextMap.has(entry.parentPath)) {
-        pathContextMap.set(entry.parentPath, 'media');
-      }
-    }
-  }
 
-  // If we have commit info, check existing entries to avoid unnecessary processing
-  let existingEntries: any[] = [];
-  if (commit) {
-    const allPaths = [...modifiedFiles.map(f => f.path), ...addedFiles.map(f => f.path)];
-    
-    if (allPaths.length > 0) {
-      existingEntries = await db.query.cachedEntriesTable.findMany({
-        where: and(
-          eq(cachedEntriesTable.owner, owner),
-          eq(cachedEntriesTable.repo, repo),
-          eq(cachedEntriesTable.branch, branch),
-          inArray(cachedEntriesTable.path, allPaths)
-        )
-      });
-    }
+    existingFilesMap = new Map(existingFiles.map(f => [f.path, f]));
   }
 
-  // Filter files to only those with parent paths in our cache
-  // AND if we have commit info, only those that need updating
-  const modifiedFilesToProcess = modifiedFiles.filter(file => {
+  // 6. Determine which files need processing
+  const filesToProcess = [...modifiedFiles, ...addedFiles].filter(file => {
     const parentPath = path.dirname(file.path);
-    const hasContext = pathContextMap.has(parentPath);
-    
-    if (!hasContext) return false;
-    
-    // If no commit info, always process
-    if (!commit) return true;
-    
-    // Check if we need to process this file
-    const existingEntry = existingEntries.find(e => e.path === file.path);
-    
-    // If no existing entry, we need to process it
+    if (!pathContextMap.has(parentPath)) return false;
+
+    if (!commit) return true; // No commit info—process
+
+    const existingEntry = existingFilesMap.get(file.path);
     if (!existingEntry) return true;
-    
-    // If we have a newer version based on timestamp, skip
-    if (existingEntry.commitTimestamp && 
-        existingEntry.commitTimestamp > commit.timestamp) {
+
+    if (existingEntry.commitTimestamp && existingEntry.commitTimestamp > commit.timestamp) {
       return false;
     }
-    
-    // If timestamps are equal, check commit SHA
+
     if (existingEntry.commitTimestamp === commit.timestamp &&
         existingEntry.commitSha === commit.sha) {
       return false;
     }
-    
-    return true;
-  });
-  
-  const addedFilesToProcess = addedFiles.filter(file => {
-    const parentPath = path.dirname(file.path);
-    const hasContext = pathContextMap.has(parentPath);
-    
-    if (!hasContext) return false;
-    
-    // For added files with commit info, check if they already exist
-    if (commit) {
-      const existingEntry = existingEntries.find(e => e.path === file.path);
-      
-      // If it exists and we have a newer or same version, skip
-      if (existingEntry && existingEntry.commitTimestamp && 
-          existingEntry.commitTimestamp >= commit.timestamp) {
-        return false;
-      }
-    }
-    
+
     return true;
   });
 
-  const filesToFetch = [...modifiedFilesToProcess, ...addedFilesToProcess];
-  
-  if (filesToFetch.length === 0) return;
+  if (filesToProcess.length === 0) return;
 
-  // Fetch content for all files in a single GraphQL query
+  // 7. Fetch file contents via GitHub GraphQL API
   const octokit = createOctokitInstance(token);
-  
-  const query = `
-    query($owner: String!, $repo: String!, ${filesToFetch.map((_, i) => `$exp${i}: String!`).join(', ')}) {
-      repository(owner: $owner, name: $repo) {
-        ${filesToFetch.map((_, i) => `
-          file${i}: object(expression: $exp${i}) {
-            ... on Blob {
-              text
-              oid
-              byteSize
+  const graphqlChunks = [];
+  const CHUNK_SIZE = 50; // Prevent hitting GitHub limits
+
+  for (let i = 0; i < filesToProcess.length; i += CHUNK_SIZE) {
+    graphqlChunks.push(filesToProcess.slice(i, i + CHUNK_SIZE));
+  }
+
+  for (const chunk of graphqlChunks) {
+    const query = `
+      query($owner: String!, $repo: String!, ${chunk.map((_, i) => `$exp${i}: String!`).join(', ')}) {
+        repository(owner: $owner, name: $repo) {
+          ${chunk.map((_, i) => `
+            file${i}: object(expression: $exp${i}) {
+              ... on Blob {
+                text
+                oid
+                byteSize
+              }
             }
-          }
-        `).join('\n')}
+          `).join('\n')}
+        }
       }
+    `;
+
+    const variables = {
+      owner,
+      repo,
+      ...Object.fromEntries(chunk.map((file, i) => [`exp${i}`, `${branch}:${file.path}`]))
+    };
+
+    let response: any;
+    try {
+      response = await octokit.graphql(query, variables);
+    } catch (error: any) {
+      console.error(`GraphQL query failed for chunk containing files [${chunk.map(f => f.path).join(", ")}]: ${error.message}`);
+      continue; // Skip this chunk and move to the next
     }
-  `;
 
-  const variables = {
-    owner,
-    repo,
-    ...Object.fromEntries(
-      filesToFetch.map((file, i) => [`exp${i}`, `${branch}:${file.path}`])
-    )
-  };
+    // 8. Process responses sequentially
+    for (let i = 0; i < chunk.length; i++) {
+      const file = chunk[i];
+      const fileData = response.repository[`file${i}`];
 
-  const response: any = await octokit.graphql(query, variables);
+      if (!fileData) {
+        console.warn(`Skipping cache update for ${file.path}: File data missing from GitHub response.`);
+        continue; // Skip this individual file
+      }
 
-  // Process the results and separate into updates and inserts
-  const entriesToUpdate = [];
-  const entriesToInsert = [];
+      const parentPath = path.dirname(file.path);
+      const context = pathContextMap.get(parentPath)!;
+      const existingEntry = existingFilesMap.get(file.path);
+      const now = Date.now();
 
-  for (let i = 0; i < filesToFetch.length; i++) {
-    const file = filesToFetch[i];
-    const fileData = response.repository[`file${i}`];
-    const parentPath = path.dirname(file.path);
-    const context = pathContextMap.get(parentPath)!; // We know this exists because of our filter
-    
-    const isModified = modifiedFiles.some(f => f.path === file.path);
-    
-    if (isModified) {
-      entriesToUpdate.push({
-        context,
-        owner,
-        repo,
-        branch,
-        path: file.path,
-        content: fileData.text,
-        sha: fileData.oid,
-        size: fileData.byteSize,
-        downloadUrl: null,
-        lastUpdated: Date.now(),
-        ...(commit ? {
-          commitSha: commit.sha,
-          commitTimestamp: commit.timestamp
-        } : {})
-      });
-    } else {
-      entriesToInsert.push({
+      const entryData = {
         context,
         owner,
         repo,
@@ -246,49 +185,25 @@ const updateMultipleFilesCache = async (
         parentPath,
         name: path.basename(file.path),
         type: 'blob',
-        content: fileData.text,
+        content: context === 'collection' ? fileData.text : null,
         sha: fileData.oid,
         size: fileData.byteSize,
         downloadUrl: null,
-        lastUpdated: Date.now(),
-        ...(commit ? {
-          commitSha: commit.sha,
-          commitTimestamp: commit.timestamp
-        } : {})
-      });
+        lastUpdated: now,
+        commitSha: commit?.sha ?? null,
+        commitTimestamp: commit?.timestamp ?? null
+      };
+
+      if (existingEntry) {
+        await db.update(cacheTable)
+          .set(entryData)
+          .where(eq(cacheTable.id, existingEntry.id));
+      } else {
+        await db.insert(cacheTable).values(entryData);
+      }
     }
   }
-
-  // Batch update modified entries
-  if (entriesToUpdate.length > 0) {
-    await Promise.all(entriesToUpdate.map(entry => 
-      db.update(cachedEntriesTable)
-        .set({
-          content: entry.content,
-          sha: entry.sha,
-          size: entry.size,
-          downloadUrl: entry.downloadUrl,
-          lastUpdated: entry.lastUpdated,
-          ...(entry.commitSha ? { commitSha: entry.commitSha } : {}),
-          ...(entry.commitTimestamp ? { commitTimestamp: entry.commitTimestamp } : {})
-        })
-        .where(
-          and(
-            eq(cachedEntriesTable.context, entry.context),
-            eq(cachedEntriesTable.owner, entry.owner),
-            eq(cachedEntriesTable.repo, entry.repo),
-            eq(cachedEntriesTable.branch, entry.branch),
-            eq(cachedEntriesTable.path, entry.path)
-          )
-        )
-    ));
-  }
-
-  // Batch insert new entries
-  if (entriesToInsert.length > 0) {
-    await db.insert(cachedEntriesTable).values(entriesToInsert);
-  }
-}
+};
 
 // Attempt to get a collection from cache, if not found, fetch from GitHub.
 const getCachedCollection = async (
@@ -299,25 +214,25 @@ const getCachedCollection = async (
   token: string
 ) => {
   // Check the cache (no context as we may invalidate media cache)
-  let entries = await db.query.cachedEntriesTable.findMany({
+  let entries = await db.query.cacheTable.findMany({
     where: and(
-      eq(cachedEntriesTable.owner, owner),
-      eq(cachedEntriesTable.repo, repo),
-      eq(cachedEntriesTable.branch, branch),
-      eq(cachedEntriesTable.parentPath, path)
+      eq(cacheTable.owner, owner),
+      eq(cacheTable.repo, repo),
+      eq(cacheTable.branch, branch),
+      eq(cacheTable.parentPath, path)
     )
   });
 
   if (entries.length === 0 || (entries.length > 0 && entries[0].context === 'media')) {
     if (entries.length > 0 && entries[0].context === 'media') {
       // Drop the media context cache and override it 
-      await db.delete(cachedEntriesTable).where(
+      await db.delete(cacheTable).where(
         and(
-        eq(cachedEntriesTable.owner, owner),
-        eq(cachedEntriesTable.repo, repo),
-        eq(cachedEntriesTable.branch, branch),
-        eq(cachedEntriesTable.parentPath, path),
-        eq(cachedEntriesTable.context, 'media')
+        eq(cacheTable.owner, owner),
+        eq(cacheTable.repo, repo),
+        eq(cacheTable.branch, branch),
+        eq(cacheTable.parentPath, path),
+        eq(cacheTable.context, 'media')
         )
       );
     }
@@ -357,7 +272,7 @@ const getCachedCollection = async (
 
     if (githubEntries.length > 0) {
       // We populate the cache
-      entries = await db.insert(cachedEntriesTable)
+      entries = await db.insert(cacheTable)
         .values(githubEntries.map((entry: any) => ({
           context: 'collection',
           owner,
@@ -394,12 +309,12 @@ const updateFileCache = async (
   switch (operation.type) {
     case 'delete':
       // We always remove entries from the cache when the file is deleted
-      await db.delete(cachedEntriesTable).where(
+      await db.delete(cacheTable).where(
         and(
-          eq(cachedEntriesTable.owner, owner),
-          eq(cachedEntriesTable.repo, repo),
-          eq(cachedEntriesTable.branch, branch),
-          eq(cachedEntriesTable.path, operation.path)
+          eq(cacheTable.owner, owner),
+          eq(cacheTable.repo, repo),
+          eq(cacheTable.branch, branch),
+          eq(cacheTable.path, operation.path)
         )
       );
       break;
@@ -412,8 +327,7 @@ const updateFileCache = async (
 
       if (operation.type === 'modify') {
         // We always update entries in the cache if they are already present
-        
-        const query = db.update(cachedEntriesTable)
+        await db.update(cacheTable)
           .set({
             content: operation.content,
             sha: operation.sha,
@@ -427,35 +341,29 @@ const updateFileCache = async (
           })
           .where(
             and(
-              eq(cachedEntriesTable.context, context),
-              eq(cachedEntriesTable.owner, owner),
-              eq(cachedEntriesTable.repo, repo),
-              eq(cachedEntriesTable.branch, branch),
-              eq(cachedEntriesTable.path, operation.path)
+              eq(cacheTable.context, context),
+              eq(cacheTable.owner, owner),
+              eq(cacheTable.repo, repo),
+              eq(cacheTable.branch, branch),
+              eq(cacheTable.path, operation.path)
             )
           );
-
-        // Log the SQL query
-        console.log('SQL Query:', query.toSQL());
-
-        // Execute the query
-        await query;
       } else {
         // We only cache collections and media folders. We only add files that already
         // have siblings in the cache. If not we can assume the collection or media
         // folder hasn't been cached yet, so we skip to avoid caching a single file.
-        const sibling = await db.query.cachedEntriesTable.findFirst({
+        const sibling = await db.query.cacheTable.findFirst({
           where: and(
-            eq(cachedEntriesTable.context, context),
-            eq(cachedEntriesTable.owner, owner),
-            eq(cachedEntriesTable.repo, repo),
-            eq(cachedEntriesTable.branch, branch),
-            eq(cachedEntriesTable.parentPath, parentPath)
+            eq(cacheTable.context, context),
+            eq(cacheTable.owner, owner),
+            eq(cacheTable.repo, repo),
+            eq(cacheTable.branch, branch),
+            eq(cacheTable.parentPath, parentPath)
           )
         });
 
         if (sibling) {
-          await db.insert(cachedEntriesTable)
+          await db.insert(cacheTable)
             .values({
               context,
               owner,
@@ -484,7 +392,7 @@ const updateFileCache = async (
         throw new Error('newPath is required for rename operations');
       }
       
-      await db.update(cachedEntriesTable)
+      await db.update(cacheTable)
         .set({
           path: operation.newPath,
           parentPath: path.dirname(operation.newPath),
@@ -498,10 +406,10 @@ const updateFileCache = async (
         })
         .where(
           and(
-            eq(cachedEntriesTable.owner, owner),
-            eq(cachedEntriesTable.repo, repo),
-            eq(cachedEntriesTable.branch, branch),
-            eq(cachedEntriesTable.path, operation.path)
+            eq(cacheTable.owner, owner),
+            eq(cacheTable.repo, repo),
+            eq(cacheTable.branch, branch),
+            eq(cacheTable.path, operation.path)
           )
         );
       break;
@@ -522,12 +430,12 @@ const getCachedMediaFolder = async (
 
   if (!nocache) {
     // Check for entries from either context
-    entries = await db.query.cachedEntriesTable.findMany({
+    entries = await db.query.cacheTable.findMany({
       where: and(
-        eq(cachedEntriesTable.owner, owner),
-        eq(cachedEntriesTable.repo, repo),
-        eq(cachedEntriesTable.branch, branch),
-        eq(cachedEntriesTable.parentPath, path)
+        eq(cacheTable.owner, owner),
+        eq(cacheTable.repo, repo),
+        eq(cacheTable.branch, branch),
+        eq(cacheTable.parentPath, path)
       )
     });
   }
@@ -566,7 +474,7 @@ const getCachedMediaFolder = async (
 
     if (!nocache && githubEntries.length > 0) {
       // Cache the entries
-      entries = await db.insert(cachedEntriesTable)
+      entries = await db.insert(cacheTable)
         .values(mappedEntries)
         .returning();
     } else {
diff --git a/tsconfig.json b/tsconfig.json
index 01d5c48f..ba1396d2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "target": "es2019",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

From bf910847c82f69f994f1d1a7943245cf242cf2f5 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 18 Mar 2025 10:57:19 +0800
Subject: [PATCH 46/95] Removing _journal.json from git

---
 .gitignore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index cfff37ec..07b9843b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,5 +35,6 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 
-# local sqlite db
-local.db
\ No newline at end of file
+# Database
+local.db
+db/migrations/meta/_journal.json

From d9e5325e5aedf51cae1a051d845a9b75c226a58f Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 18 Mar 2025 11:14:54 +0800
Subject: [PATCH 47/95] Fixing image issues in rich-text?

---
 .gitignore         | 2 +-
 lib/githubImage.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07b9843b..51d2262b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,4 @@ next-env.d.ts
 
 # Database
 local.db
-db/migrations/meta/_journal.json
+db/migrations/meta/_journal.json
\ No newline at end of file
diff --git a/lib/githubImage.ts b/lib/githubImage.ts
index 919c53d4..ae7af900 100644
--- a/lib/githubImage.ts
+++ b/lib/githubImage.ts
@@ -126,7 +126,7 @@ const relativeToRawUrls = async (
     const src = match[1] || match[2];
     const quote = match[1] ? "\"" : "'";
 
-    if (!src.startsWith("/") && !src.startsWith("http://") && !src.startsWith("https://") && !src.startsWith("data:image/")) {  
+    if (!src.startsWith("http://") && !src.startsWith("https://") && !src.startsWith("data:image/")) {  
       // TODO: what does the function returns if it fails?
       const rawUrl = await getRawUrl(owner, repo, branch, name, src, isPrivate, true);
       if (rawUrl) {

From 7f87ce985ece8ea1a0e064271a3adf39e21edf10 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 18 Mar 2025 16:22:21 +0800
Subject: [PATCH 48/95] Fixing media

---
 .../[branch]/media/[name]/[path]/route.ts     |  14 -
 components/media/media-view.tsx               |  32 +-
 db/scripts/clear-cache.ts                     |  12 +
 fields/core/file/edit-component.tsx           |  33 +-
 fields/core/file/index.tsx                    |   1 +
 lib/githubCache.ts                            |  10 +-
 package-lock.json                             | 487 ++++++++++++++++++
 package.json                                  |   3 +-
 8 files changed, 562 insertions(+), 30 deletions(-)
 create mode 100644 db/scripts/clear-cache.ts

diff --git a/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
index c88a779e..1de79ddf 100644
--- a/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
@@ -44,20 +44,6 @@ export async function GET(
 
     let results = await getCachedMediaFolder(params.owner, params.repo, params.branch, normalizedPath, token, !!nocache);
 
-    // const octokit = createOctokitInstance(token);
-    // const response = await octokit.rest.repos.getContent({
-    //   owner: params.owner,
-    //   repo: params.repo,
-    //   path: normalizedPath,
-    //   ref: params.branch,
-    // });
-
-    // if (!Array.isArray(response.data)) {
-    //   throw new Error("Expected a directory but found a file.");
-    // }
-
-    // let results = response.data;
-
     if (mediaConfig.extensions && mediaConfig.extensions.length > 0) {
       results = results.filter((item) => {
         if (item.type === "dir") return true;
diff --git a/components/media/media-view.tsx b/components/media/media-view.tsx
index c42bf6d7..5db1dc85 100644
--- a/components/media/media-view.tsx
+++ b/components/media/media-view.tsx
@@ -37,12 +37,16 @@ const MediaView = ({
   initialSelected,
   maxSelected,
   onSelect,
+  extensions,
+  categories
 }: {
   name: string,
   initialPath?: string,
   initialSelected?: string[],
   maxSelected?: number,
-  onSelect?: (newSelected: string[]) => void
+  onSelect?: (newSelected: string[]) => void,
+  extensions?: string[],
+  categories?: string[]
 }) => {
   const { config } = useConfig();
   if (!config) throw new Error(`Configuration not found.`);
@@ -55,7 +59,16 @@ const MediaView = ({
   const searchParams = useSearchParams();
   const pathname = usePathname();
   const router = useRouter();
-  
+
+  const filteredExtensions = useMemo(() => {
+    if (extensions != null) {
+      return extensions;
+    } else if (categories != null) {
+      return categories.flatMap((category: string) => extensionCategories[category]);
+    }
+    return mediaConfig?.extensions || [];
+  }, [extensions, categories, mediaConfig?.extensions]);
+
   const filesGridRef = useRef<HTMLDivElement | null>(null);
 
   const [error, setError] = useState<string | null | undefined>(null);
@@ -69,6 +82,17 @@ const MediaView = ({
     return mediaConfig.input;
   });
   const [data, setData] = useState<Record<string, any>[] | undefined>(undefined);
+  
+  // Filter the data based on filteredExtensions when displaying
+  const filteredData = useMemo(() => {
+    if (!data) return undefined;
+    if (!filteredExtensions || filteredExtensions.length === 0) return data;
+    return data.filter(item => 
+      item.type === "dir" ||
+      filteredExtensions.includes(item.extension?.toLowerCase())
+    );
+  }, [data, filteredExtensions]);
+
   const [isLoading, setIsLoading] = useState(true);
   
   useEffect(() => {
@@ -262,9 +286,9 @@ const MediaView = ({
       <div className="relative flex-1 overflow-auto scrollbar" ref={filesGridRef}>
         {isLoading
           ? loadingSkeleton
-          : data && data.length > 0
+          : filteredData && filteredData.length > 0
               ? <ul className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-8 p-1">
-                  {data.map((item, index) => 
+                  {filteredData.map((item, index) => 
                     <li key={item.path}>
                       {item.type === "dir"
                         ? <button
diff --git a/db/scripts/clear-cache.ts b/db/scripts/clear-cache.ts
new file mode 100644
index 00000000..27fe5e71
--- /dev/null
+++ b/db/scripts/clear-cache.ts
@@ -0,0 +1,12 @@
+import { db } from '../index';
+import { cacheTable } from '../schema';
+
+db.delete(cacheTable)
+  .then(() => {
+    console.log('✅ Cache table cleared successfully');
+    process.exit(0);
+  })
+  .catch((error) => {
+    console.error('❌ Error clearing cache:', error);
+    process.exit(1);
+  });
\ No newline at end of file
diff --git a/fields/core/file/edit-component.tsx b/fields/core/file/edit-component.tsx
index b443819a..6f225f0a 100644
--- a/fields/core/file/edit-component.tsx
+++ b/fields/core/file/edit-component.tsx
@@ -4,9 +4,9 @@ import { forwardRef, useCallback, useState, useEffect } from "react";
 import { Button } from "@/components/ui/button";
 import { MediaUpload } from "@/components/media/media-upload";
 import { MediaDialog } from "@/components/media/media-dialog";
-import { Trash2, Upload, File, FileText, FileVideo, FileImage, FileAudio, FileArchive, FileCode, FileType, FileSpreadsheet, GripVertical, Folder, FolderOpen } from "lucide-react";
+import { Trash2, Upload, File, FileText, FileVideo, FileImage, FileAudio, FileArchive, FileCode, FileType, FileSpreadsheet, GripVertical, FolderOpen, ArrowUpRight } from "lucide-react";
 import { useConfig } from "@/contexts/config-context";
-import { getFileExtension, getFileName, extensionCategories, getParentPath } from "@/lib/utils/file";
+import { getFileExtension, getFileName, extensionCategories } from "@/lib/utils/file";
 import {
   Tooltip,
   TooltipContent,
@@ -19,12 +19,15 @@ import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import { v4 as uuidv4 } from 'uuid';
 import { getSchemaByName } from "@/lib/schema";
+import { cn } from "@/lib/utils";
+import { buttonVariants } from "@/components/ui/button";
 
 const generateId = () => uuidv4().slice(0, 8);
 
-const SortableItem = ({ id, file, onRemove, getFileIcon }: { 
+const SortableItem = ({ id, file, config, onRemove, getFileIcon }: { 
   id: string;
   file: string;
+  config: any;
   onRemove: (file: string) => void;
   getFileIcon: (file: string) => React.ReactNode;
 }) => {
@@ -60,16 +63,33 @@ const SortableItem = ({ id, file, onRemove, getFileIcon }: {
           <span className="ml-2 text-muted-foreground truncate">{file}</span>
         </div>
 
-        <div>
+        <div className="flex items-center">
+          <TooltipProvider>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <a
+                  href={`https://github.com/${config.owner}/${config.repo}/blob/${config.branch}/${file}`}
+                  target="_blank"
+                  className={cn(buttonVariants({ variant: "ghost", size: "icon-xs" }), "text-muted-foreground hover:text-foreground transition-colors")}
+                >
+                  <ArrowUpRight className="h-4 w-4" />
+                </a>
+              </TooltipTrigger>
+              <TooltipContent>
+                See on GitHub
+              </TooltipContent>
+            </Tooltip>
+          </TooltipProvider>
+
           <TooltipProvider>
             <Tooltip>
               <TooltipTrigger asChild>
                 <Button
                   type="button"
                   variant="ghost"
-                  size="sm"
+                  size="icon-xs"
                   onClick={() => onRemove(file)}
-                  className="h-8 w-8 p-0"
+                  className="h-8 w-8 p-0 text-muted-foreground hover:text-foreground transition-colors"
                 >
                   <Trash2 className="h-4 w-4" />
                 </Button>
@@ -214,6 +234,7 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
                 key={file.id}
                 id={file.id}
                 file={file.path}
+                config={config}
                 onRemove={() => handleRemove(file.id)}
                 getFileIcon={getFileIcon}
               />
diff --git a/fields/core/file/index.tsx b/fields/core/file/index.tsx
index 581a0d2c..f0ca724a 100644
--- a/fields/core/file/index.tsx
+++ b/fields/core/file/index.tsx
@@ -32,6 +32,7 @@ const write = (value: any, field: Field, config: Record<string, any>): string |
   return swapPrefix(value, prefixInput, prefixOutput);
 };
 
+// TODO: add validation for media path and file extension
 const schema = (field: Field) => {
   let zodSchema: z.ZodTypeAny = z.coerce.string();
 
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index 7e8973a4..a10f11f2 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -184,7 +184,7 @@ const updateMultipleFilesCache = async (
         path: file.path,
         parentPath,
         name: path.basename(file.path),
-        type: 'blob',
+        type: 'file',
         content: context === 'collection' ? fileData.text : null,
         sha: fileData.oid,
         size: fileData.byteSize,
@@ -281,7 +281,7 @@ const getCachedCollection = async (
           parentPath: path,
           name: entry.name,
           path: entry.path,
-          type: entry.type,
+          type: entry.type === 'blob' ? 'file' : 'dir',
           content: entry.type === "blob" ? entry.object.text : null,
           sha: entry.type === "blob" ? entry.object.oid : null,
           size: entry.type === "blob" ? entry.object.byteSize : null,
@@ -372,7 +372,7 @@ const updateFileCache = async (
               path: operation.path,
               parentPath,
               name: path.basename(operation.path),
-              type: 'blob',
+              type: 'file',
               content: operation.content,
               sha: operation.sha,
               size: operation.size,
@@ -439,7 +439,7 @@ const getCachedMediaFolder = async (
       )
     });
   }
-
+  
   if (entries.length === 0) {  
     // No cache hit, fetch from GitHub
     const octokit = createOctokitInstance(token);
@@ -462,7 +462,7 @@ const getCachedMediaFolder = async (
       parentPath: path,
       name: entry.name,
       path: entry.path,
-      type: entry.type === "file" ? "blob" : "tree",
+      type: entry.type,
       content: null,
       sha: entry.sha,
       size: entry.size || null,
diff --git a/package-lock.json b/package-lock.json
index b414c3f5..194688d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -95,6 +95,7 @@
         "npm": "^10.8.1",
         "postcss": "^8.4.38",
         "tailwindcss": "^3.4.3",
+        "tsx": "^4.19.3",
         "typescript": "^5.4.5",
         "uninstall": "^0.0.0"
       }
@@ -1504,6 +1505,23 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz",
+      "integrity": "sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/netbsd-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
@@ -1520,6 +1538,23 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz",
+      "integrity": "sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/openbsd-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
@@ -13224,6 +13259,458 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
       "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
     },
+    "node_modules/tsx": {
+      "version": "4.19.3",
+      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.3.tgz",
+      "integrity": "sha512-4H8vUNGNjQ4V2EOoGw005+c+dGuPSnhpPBPHBtsZdGZBk/iJb4kguGlPWaZTZ3q5nMtFOEsY0nRDlh9PJyd6SQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "~0.25.0",
+        "get-tsconfig": "^4.7.5"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz",
+      "integrity": "sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-arm": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.1.tgz",
+      "integrity": "sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-arm64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz",
+      "integrity": "sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/android-x64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.1.tgz",
+      "integrity": "sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz",
+      "integrity": "sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/darwin-x64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz",
+      "integrity": "sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz",
+      "integrity": "sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz",
+      "integrity": "sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz",
+      "integrity": "sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz",
+      "integrity": "sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ia32": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz",
+      "integrity": "sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-loong64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz",
+      "integrity": "sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz",
+      "integrity": "sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz",
+      "integrity": "sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz",
+      "integrity": "sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-s390x": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz",
+      "integrity": "sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/linux-x64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz",
+      "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz",
+      "integrity": "sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz",
+      "integrity": "sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/sunos-x64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz",
+      "integrity": "sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-arm64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz",
+      "integrity": "sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-ia32": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz",
+      "integrity": "sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/@esbuild/win32-x64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz",
+      "integrity": "sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tsx/node_modules/esbuild": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.1.tgz",
+      "integrity": "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.25.1",
+        "@esbuild/android-arm": "0.25.1",
+        "@esbuild/android-arm64": "0.25.1",
+        "@esbuild/android-x64": "0.25.1",
+        "@esbuild/darwin-arm64": "0.25.1",
+        "@esbuild/darwin-x64": "0.25.1",
+        "@esbuild/freebsd-arm64": "0.25.1",
+        "@esbuild/freebsd-x64": "0.25.1",
+        "@esbuild/linux-arm": "0.25.1",
+        "@esbuild/linux-arm64": "0.25.1",
+        "@esbuild/linux-ia32": "0.25.1",
+        "@esbuild/linux-loong64": "0.25.1",
+        "@esbuild/linux-mips64el": "0.25.1",
+        "@esbuild/linux-ppc64": "0.25.1",
+        "@esbuild/linux-riscv64": "0.25.1",
+        "@esbuild/linux-s390x": "0.25.1",
+        "@esbuild/linux-x64": "0.25.1",
+        "@esbuild/netbsd-arm64": "0.25.1",
+        "@esbuild/netbsd-x64": "0.25.1",
+        "@esbuild/openbsd-arm64": "0.25.1",
+        "@esbuild/openbsd-x64": "0.25.1",
+        "@esbuild/sunos-x64": "0.25.1",
+        "@esbuild/win32-arm64": "0.25.1",
+        "@esbuild/win32-ia32": "0.25.1",
+        "@esbuild/win32-x64": "0.25.1"
+      }
+    },
     "node_modules/turndown": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/turndown/-/turndown-7.2.0.tgz",
diff --git a/package.json b/package.json
index a9cdbcc6..9fa870bd 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
     "start": "next start",
     "lint": "next lint",
     "db:generate": "npx drizzle-kit generate",
-    "db:migrate": "npx drizzle-kit migrate"
+    "db:migrate": "npx drizzle-kit migrate",
+    "db:clear-cache": "npx tsx db/scripts/clear-cache.ts"
   },
   "dependencies": {
     "@codemirror/lang-html": "^6.4.9",

From 796ccbdfc1632cf682b6ac74eaba910a3ec6d6af Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 18 Mar 2025 16:30:50 +0800
Subject: [PATCH 49/95] Fixing collections api

---
 app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
index 156844f5..10f32767 100644
--- a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
@@ -113,7 +113,7 @@ const parseContents = (
 
   parsedContents = contents.map((item: any) => {
     // If it's a file and it matches the schema extension
-    if (item.type === "blob" && (item.path.endsWith(`.${schema.extension}`) || schema.extension === "") && !excludedFiles.includes(item.name)) {
+    if (item.type === "file" && (item.path.endsWith(`.${schema.extension}`) || schema.extension === "") && !excludedFiles.includes(item.name)) {
       let contentObject: Record<string, any> = {};
       
       if (serializedTypes.includes(schema.format) && schema.fields) {

From 076bee07440459b9d126b6673aff96ef82ba282a Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 18 Mar 2025 18:51:31 +0800
Subject: [PATCH 50/95] Adding back drizzle journal

---
 .gitignore                          |  3 +-
 components/media/media-dialog.tsx   | 10 ++--
 components/media/media-upload.tsx   | 59 ++++++++++++-------
 components/media/media-view.tsx     | 20 +++----
 db/migrations/meta/_journal.json    | 20 +++++++
 fields/core/file/edit-component.tsx | 87 ++++++++++++++++++++++++-----
 fields/core/file/index.tsx          |  5 +-
 7 files changed, 147 insertions(+), 57 deletions(-)
 create mode 100644 db/migrations/meta/_journal.json

diff --git a/.gitignore b/.gitignore
index 51d2262b..4bcdc757 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,5 +36,4 @@ yarn-error.log*
 next-env.d.ts
 
 # Database
-local.db
-db/migrations/meta/_journal.json
\ No newline at end of file
+local.db
\ No newline at end of file
diff --git a/components/media/media-dialog.tsx b/components/media/media-dialog.tsx
index 1a3b56d7..2228dd63 100644
--- a/components/media/media-dialog.tsx
+++ b/components/media/media-dialog.tsx
@@ -22,14 +22,14 @@ export interface MediaDialogHandle {
 }
 
 const MediaDialog = forwardRef(({
-  name,
+  media,
   selected,
   onSubmit,
   maxSelected,
   initialPath,
   children
 }: {
-  name?: string,
+  media?: string,
   onSubmit: (images: string[]) => void,
   selected?: string[],
   maxSelected?: number,
@@ -39,8 +39,8 @@ const MediaDialog = forwardRef(({
   const { config } = useConfig();
   if (!config) throw new Error(`Configuration not found.`);
 
-  const configMedia = name
-    ? getSchemaByName(config.object, name, "media")
+  const configMedia = media
+    ? getSchemaByName(config.object, media, "media")
     : config.object.media[0];
 
   const selectedImagesRef = useRef(selected || []);
@@ -72,7 +72,7 @@ const MediaDialog = forwardRef(({
           <DialogDescription></DialogDescription>
         </DialogHeader>
         
-        <MediaView name={configMedia.name} initialSelected={selected || []} onSelect={handleSelect} maxSelected={maxSelected} initialPath={initialPath || ""}/>
+        <MediaView media={configMedia.name} initialSelected={selected || []} onSelect={handleSelect} maxSelected={maxSelected} initialPath={initialPath || ""}/>
         {configMedia.input &&
           <DialogFooter>
             <DialogClose asChild>
diff --git a/components/media/media-upload.tsx b/components/media/media-upload.tsx
index 6143991f..b6e08176 100644
--- a/components/media/media-upload.tsx
+++ b/components/media/media-upload.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useRef, isValidElement, cloneElement } from "react";
+import { useRef, isValidElement, cloneElement, useMemo, useCallback } from "react";
 import { useConfig } from "@/contexts/config-context";
 import { joinPathSegments } from "@/lib/utils/file";
 import { toast } from "sonner";
@@ -10,29 +10,42 @@ const MediaUpload = ({
   children,
   path,
   onUpload,
-  name
+  media,
+  extensions
 }: {
   children: React.ReactElement<{ onClick: () => void }>;
   path?: string;
   onUpload?: (path: string) => void;
-  name?: string;
+  media?: string;
+  extensions?: string[];
 }) => {
   const fileInputRef = useRef(null);
 
   const { config } = useConfig();
   if (!config) throw new Error(`Configuration not found.`);
 
-  const configMedia = name
-    ? getSchemaByName(config.object, name, "media")
-    : config.object.media[0];
+  const configMedia = useMemo(() => 
+    media
+      ? getSchemaByName(config.object, media, "media")
+      : config.object.media[0],
+    [media, config.object]
+  );
 
-  const handleTriggerClick = () => {
-    if (fileInputRef.current) {
-      (fileInputRef.current as HTMLInputElement).click();
-    }
-  };
+  const mediaExtensions = configMedia.extensions;
+
+  const accept = useMemo(() => {
+    if (!configMedia?.extensions) return undefined;
+    
+    const allowedExtensions = extensions 
+      ? extensions.filter(ext => configMedia.extensions.includes(ext))
+      : configMedia.extensions;
 
-  const handleFileInput = async (event: React.ChangeEvent<HTMLInputElement>): Promise<void> => {
+    return allowedExtensions.length > 0
+      ? allowedExtensions.map(extension => `.${extension}`).join(",")
+      : undefined;
+  }, [extensions, configMedia?.extensions]);
+
+  const handleFileInput = useCallback(async (event: React.ChangeEvent<HTMLInputElement>): Promise<void> => {
     const readFileContent = (file: File): Promise<string | null> => {
       return new Promise((resolve, reject) => {
         const reader = new FileReader();
@@ -90,16 +103,20 @@ const MediaUpload = ({
         console.error(error);
       }
     }
-  };
-  
-  const trigger = isValidElement(children)
-    ? cloneElement(children, { onClick: handleTriggerClick })
-    : null;
+  }, [config, path, configMedia.name, onUpload]);
 
-  const mediaExtensions = configMedia.extensions;
-  const accept = mediaExtensions && mediaExtensions.length > 0
-    ? mediaExtensions.map((extension: string) => `.${extension}`).join(",")
-    : undefined;
+  const handleTriggerClick = useCallback(() => {
+    if (fileInputRef.current) {
+      (fileInputRef.current as HTMLInputElement).click();
+    }
+  }, []);
+
+  const trigger = useMemo(() => 
+    isValidElement(children)
+      ? cloneElement(children, { onClick: handleTriggerClick })
+      : null,
+    [children, handleTriggerClick]
+  );
 
   return (
     <>
diff --git a/components/media/media-view.tsx b/components/media/media-view.tsx
index 5db1dc85..0adedf45 100644
--- a/components/media/media-view.tsx
+++ b/components/media/media-view.tsx
@@ -32,29 +32,27 @@ import {
 } from "lucide-react";
 
 const MediaView = ({
-  name,
+  media,
   initialPath,
   initialSelected,
   maxSelected,
   onSelect,
-  extensions,
-  categories
+  extensions
 }: {
-  name: string,
+  media: string,
   initialPath?: string,
   initialSelected?: string[],
   maxSelected?: number,
   onSelect?: (newSelected: string[]) => void,
-  extensions?: string[],
-  categories?: string[]
+  extensions?: string[]
 }) => {
   const { config } = useConfig();
   if (!config) throw new Error(`Configuration not found.`);
 
   const mediaConfig = useMemo(() => {
-    if (!name) return config.object.media[0];
-    return config.object.media.find((item: any) => item.name === name);
-  }, [name, config.object.media]);
+    if (!media) return config.object.media[0];
+    return config.object.media.find((item: any) => item.name === media);
+  }, [media, config.object.media]);
 
   const searchParams = useSearchParams();
   const pathname = usePathname();
@@ -102,7 +100,7 @@ const MediaView = ({
         setError(null);
 
         try {
-          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media/${encodeURIComponent(name)}/${encodeURIComponent(path)}`);
+          const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media/${encodeURIComponent(mediaConfig.name)}/${encodeURIComponent(path)}`);
           if (!response.ok) throw new Error(`Failed to fetch media: ${response.status} ${response.statusText}`);
 
           const data: any = await response.json();
@@ -276,7 +274,7 @@ const MediaView = ({
             <FolderPlus className="h-3.5 w-3.5"/>
           </Button>
         </FolderCreate>
-        <MediaUpload name={mediaConfig.name} path={path} onUpload={handleUpload}>
+        <MediaUpload media={mediaConfig.name} path={path} onUpload={handleUpload}>
           <Button type="button" size="sm" className="gap-2">
             <Upload className="h-3.5 w-3.5"/>
             Upload
diff --git a/db/migrations/meta/_journal.json b/db/migrations/meta/_journal.json
new file mode 100644
index 00000000..f4884a86
--- /dev/null
+++ b/db/migrations/meta/_journal.json
@@ -0,0 +1,20 @@
+{
+  "version": "7",
+  "dialect": "sqlite",
+  "entries": [
+    {
+      "idx": 0,
+      "version": "6",
+      "when": 1733392958887,
+      "tag": "0000_lame_dormammu",
+      "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1742264373167,
+      "tag": "0001_late_shinko_yamashiro",
+      "breakpoints": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/fields/core/file/edit-component.tsx b/fields/core/file/edit-component.tsx
index 6f225f0a..5a36b818 100644
--- a/fields/core/file/edit-component.tsx
+++ b/fields/core/file/edit-component.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { forwardRef, useCallback, useState, useEffect } from "react";
+import { forwardRef, useCallback, useState, useEffect, useMemo } from "react";
 import { Button } from "@/components/ui/button";
 import { MediaUpload } from "@/components/media/media-upload";
 import { MediaDialog } from "@/components/media/media-dialog";
 import { Trash2, Upload, File, FileText, FileVideo, FileImage, FileAudio, FileArchive, FileCode, FileType, FileSpreadsheet, GripVertical, FolderOpen, ArrowUpRight } from "lucide-react";
 import { useConfig } from "@/contexts/config-context";
-import { getFileExtension, getFileName, extensionCategories } from "@/lib/utils/file";
+import { getFileExtension, getFileName, extensionCategories, normalizePath } from "@/lib/utils/file";
 import {
   Tooltip,
   TooltipContent,
@@ -117,16 +117,60 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
       : []
   );
 
-  const isMultiple = field.options?.multiple !== undefined && field.options?.multiple !== false;
-  const mediaConfig = field.options?.media
-    ? getSchemaByName(config?.object, field.options?.media, "media")
-    : config?.object.media[0];
-  const rootPath = field.options?.path || mediaConfig.input;
-  const remainingSlots = field.options?.multiple
-    ? field.options.multiple.max
-      ? field.options.multiple.max - files.length
-      : Infinity
-    : 1 - files.length;
+  const mediaConfig = useMemo(() => {
+    if (!config?.object?.media?.length) {
+      return undefined;
+    }
+    return field.options?.media
+      ? getSchemaByName(config.object, field.options?.media, "media")
+      : config.object.media[0];
+  }, [field.options?.media, config?.object]);
+
+  const rootPath = useMemo(() => {
+    if (!field.options?.path) {
+      return mediaConfig?.input;
+    }
+
+    const normalizedPath = normalizePath(field.options.path);
+    const normalizedMediaPath = normalizePath(mediaConfig?.input);
+
+    if (!normalizedPath.startsWith(normalizedMediaPath)) {
+      console.warn(`"${field.options.path}" is not within media root "${mediaConfig?.input}". Defaulting to media root.`);
+      return mediaConfig?.input;
+    }
+
+    return normalizedPath;
+  }, [field.options?.path, mediaConfig?.input]);
+
+  const allowedExtensions = useMemo(() => {
+    if (!mediaConfig) return [];
+
+    const fieldExtensions = field.options?.extensions 
+      ? field.options.extensions
+      : field.options?.categories
+        ? field.options.categories.flatMap((category: string) => extensionCategories[category])
+        : [];
+
+    if (!fieldExtensions.length) return mediaConfig.extensions || [];
+
+    return mediaConfig.extensions
+      ? fieldExtensions.filter((ext: string) => mediaConfig.extensions.includes(ext))
+      : fieldExtensions;
+  }, [field.options?.extensions, field.options?.categories, mediaConfig]);
+
+  const isMultiple = useMemo(() => 
+    field.options?.multiple !== undefined && field.options?.multiple !== false,
+    [field.options?.multiple]
+  );
+
+  const remainingSlots = useMemo(() => 
+    field.options?.multiple
+      ? field.options.multiple.max
+        ? field.options.multiple.max - files.length
+        : Infinity
+      : 1 - files.length,
+    [field.options?.multiple, files.length]
+  );
 
   useEffect(() => {
     if (isMultiple) {
@@ -217,6 +261,20 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
     }
   }, [isMultiple]);
 
+  if (!mediaConfig) {
+    return (
+      <div className="text-muted-foreground bg-muted rounded-md px-3 py-2 h-10">
+      No media configuration found. {' '}
+      <a 
+        href={`/${config?.owner}/${config?.repo}/${encodeURIComponent(config?.branch || "")}/settings`}
+        className="underline hover:text-foreground"
+      >
+        Check your settings
+      </a>.
+    </div>
+    );
+  }
+
   return (
     <div className="space-y-2">
       <div className="space-y-2">
@@ -245,7 +303,7 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
       
       {remainingSlots > 0 && (
         <div className="flex gap-2">
-          <MediaUpload path={rootPath} name={mediaConfig.name} onUpload={handleUpload}>
+          <MediaUpload path={rootPath} media={mediaConfig.name} extensions={allowedExtensions} onUpload={handleUpload}>
             <Button type="button" size="sm" variant="outline" className="gap-2">
               <Upload className="h-3.5 w-3.5"/>
               Upload
@@ -254,9 +312,10 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
           <TooltipProvider>
             <Tooltip>
               <MediaDialog
-                name={mediaConfig.name}
+                media={mediaConfig.name}
                 initialPath={rootPath}
                 maxSelected={remainingSlots}
+                extensions={allowedExtensions}
                 onSubmit={handleSelected}
               >
                 <TooltipTrigger asChild>
diff --git a/fields/core/file/index.tsx b/fields/core/file/index.tsx
index f0ca724a..7fd28106 100644
--- a/fields/core/file/index.tsx
+++ b/fields/core/file/index.tsx
@@ -43,7 +43,4 @@ const schema = (field: Field) => {
   return zodSchema;
 };
 
-
-const supportsList = true;
-
-export { schema, ViewComponent, EditComponent, read, write, supportsList };
\ No newline at end of file
+export { schema, ViewComponent, EditComponent, read, write };
\ No newline at end of file

From eccc24504aafb7d0ae836d75f3a0e844ead12b4e Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 18 Mar 2025 19:45:19 +0800
Subject: [PATCH 51/95] Adding proper extensions logic to fiel field and media
 components

---
 components/media/media-dialog.tsx   |  8 +++++---
 components/media/media-upload.tsx   | 10 +++++-----
 components/media/media-view.tsx     | 17 ++++++++++-------
 fields/core/file/edit-component.tsx |  3 +--
 lib/githubCache.ts                  |  1 -
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/components/media/media-dialog.tsx b/components/media/media-dialog.tsx
index 2228dd63..4810624c 100644
--- a/components/media/media-dialog.tsx
+++ b/components/media/media-dialog.tsx
@@ -27,14 +27,16 @@ const MediaDialog = forwardRef(({
   onSubmit,
   maxSelected,
   initialPath,
-  children
+  children,
+  extensions
 }: {
   media?: string,
   onSubmit: (images: string[]) => void,
   selected?: string[],
   maxSelected?: number,
   initialPath?: string,
-  children?: React.ReactNode
+  children?: React.ReactNode,
+  extensions?: string[]
 }, ref) => {
   const { config } = useConfig();
   if (!config) throw new Error(`Configuration not found.`);
@@ -72,7 +74,7 @@ const MediaDialog = forwardRef(({
           <DialogDescription></DialogDescription>
         </DialogHeader>
         
-        <MediaView media={configMedia.name} initialSelected={selected || []} onSelect={handleSelect} maxSelected={maxSelected} initialPath={initialPath || ""}/>
+        <MediaView media={configMedia.name} extensions={extensions} initialSelected={selected || []} onSelect={handleSelect} maxSelected={maxSelected} initialPath={initialPath || ""}/>
         {configMedia.input &&
           <DialogFooter>
             <DialogClose asChild>
diff --git a/components/media/media-upload.tsx b/components/media/media-upload.tsx
index b6e08176..8c5e70c7 100644
--- a/components/media/media-upload.tsx
+++ b/components/media/media-upload.tsx
@@ -31,17 +31,17 @@ const MediaUpload = ({
     [media, config.object]
   );
 
-  const mediaExtensions = configMedia.extensions;
-
   const accept = useMemo(() => {
-    if (!configMedia?.extensions) return undefined;
+    if (!configMedia?.extensions && !extensions) return undefined;
     
     const allowedExtensions = extensions 
-      ? extensions.filter(ext => configMedia.extensions.includes(ext))
+      ? configMedia.extensions
+        ? extensions.filter(ext => configMedia.extensions.includes(ext))
+        : extensions
       : configMedia.extensions;
 
     return allowedExtensions.length > 0
-      ? allowedExtensions.map(extension => `.${extension}`).join(",")
+      ? allowedExtensions.map((extension: string) => `.${extension}`).join(",")
       : undefined;
   }, [extensions, configMedia?.extensions]);
 
diff --git a/components/media/media-view.tsx b/components/media/media-view.tsx
index 0adedf45..4358fb4f 100644
--- a/components/media/media-view.tsx
+++ b/components/media/media-view.tsx
@@ -59,13 +59,16 @@ const MediaView = ({
   const router = useRouter();
 
   const filteredExtensions = useMemo(() => {
-    if (extensions != null) {
-      return extensions;
-    } else if (categories != null) {
-      return categories.flatMap((category: string) => extensionCategories[category]);
-    }
-    return mediaConfig?.extensions || [];
-  }, [extensions, categories, mediaConfig?.extensions]);
+    if (!mediaConfig?.extensions && !extensions) return [];
+    
+    const allowedExtensions = extensions 
+      ? mediaConfig?.extensions
+        ? extensions.filter(ext => mediaConfig.extensions.includes(ext))
+        : extensions
+      : mediaConfig.extensions;
+
+    return allowedExtensions || [];
+  }, [extensions, mediaConfig?.extensions]);
 
   const filesGridRef = useRef<HTMLDivElement | null>(null);
 
diff --git a/fields/core/file/edit-component.tsx b/fields/core/file/edit-component.tsx
index 5a36b818..ce262770 100644
--- a/fields/core/file/edit-component.tsx
+++ b/fields/core/file/edit-component.tsx
@@ -300,7 +300,6 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
           </SortableContext>
         </DndContext>
       </div>
-      
       {remainingSlots > 0 && (
         <div className="flex gap-2">
           <MediaUpload path={rootPath} media={mediaConfig.name} extensions={allowedExtensions} onUpload={handleUpload}>
@@ -308,7 +307,7 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
               <Upload className="h-3.5 w-3.5"/>
               Upload
             </Button>
-          </MediaUpload>      
+          </MediaUpload>
           <TooltipProvider>
             <Tooltip>
               <MediaDialog
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index a10f11f2..9f6e608b 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -303,7 +303,6 @@ const updateFileCache = async (
   branch: string,
   operation: FileOperation
 ) => {
-  // console.log('updateFileCache', context, owner, repo, branch, operation);
   const parentPath = path.dirname(operation.path);
 
   switch (operation.type) {

From 818cd1676e2d58d8cd27ca647f1e004ef4da2712 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 19 Mar 2025 09:44:54 +0800
Subject: [PATCH 52/95] Adding drag and drop support for uploading files

---
 components/media/media-upload.tsx    | 226 +++++++++------
 components/media/media-view.tsx      | 146 +++++-----
 drizzle.config.ts                    |   4 +-
 fields/core/file/edit-component.tsx  | 223 ++++++++-------
 fields/core/image/edit-component.tsx | 400 ++++++++++++++++++---------
 fields/core/image/index.tsx          |  28 +-
 lib/configSchema.ts                  |   2 +-
 7 files changed, 648 insertions(+), 381 deletions(-)

diff --git a/components/media/media-upload.tsx b/components/media/media-upload.tsx
index 8c5e70c7..ea39632a 100644
--- a/components/media/media-upload.tsx
+++ b/components/media/media-upload.tsx
@@ -1,26 +1,39 @@
 "use client";
 
-import { useRef, isValidElement, cloneElement, useMemo, useCallback } from "react";
+import { useRef, isValidElement, cloneElement, useMemo, useCallback, createContext, useContext, useState } from "react";
 import { useConfig } from "@/contexts/config-context";
 import { joinPathSegments } from "@/lib/utils/file";
 import { toast } from "sonner";
 import { getSchemaByName } from "@/lib/schema";
+import { cn } from "@/lib/utils";
 
-const MediaUpload = ({
-  children,
-  path,
-  onUpload,
-  media,
-  extensions
-}: {
-  children: React.ReactElement<{ onClick: () => void }>;
+interface MediaUploadContextValue {
+  handleFiles: (files: FileList) => Promise<void>;
+  accept?: string;
+  multiple?: boolean;
+}
+
+const MediaUploadContext = createContext<MediaUploadContextValue | null>(null);
+
+interface MediaUploadProps {
+  children: React.ReactNode;
   path?: string;
   onUpload?: (path: string) => void;
   media?: string;
   extensions?: string[];
-}) => {
-  const fileInputRef = useRef(null);
+  multiple?: boolean;
+}
+
+interface MediaUploadTriggerProps {
+  children: React.ReactElement<{ onClick?: () => void }>;
+}
 
+interface MediaUploadDropZoneProps {
+  children: React.ReactNode;
+  className?: string;
+}
+
+function MediaUploadRoot({ children, path, onUpload, media, extensions, multiple }: MediaUploadProps) {
   const { config } = useConfig();
   if (!config) throw new Error(`Configuration not found.`);
 
@@ -45,78 +58,86 @@ const MediaUpload = ({
       : undefined;
   }, [extensions, configMedia?.extensions]);
 
-  const handleFileInput = useCallback(async (event: React.ChangeEvent<HTMLInputElement>): Promise<void> => {
-    const readFileContent = (file: File): Promise<string | null> => {
-      return new Promise((resolve, reject) => {
+  const handleFiles = useCallback(async (files: FileList) => {
+    try {
+      for (let i = 0; i < files.length; i++) {
         const reader = new FileReader();
-        reader.onload = () => resolve(reader.result as string);
-        reader.onerror = () => reject(new Error("Failed to read file content"));
-        reader.readAsDataURL(file); // Reads the file as base64 encoded string
-      });
-    };
+        const file = files[i];
 
-    const files = event.target.files;
-    
-    if (files && files.length > 0) {
-      try {
-        for (let i = 0; i < files.length; i++) {
-          let content = await readFileContent(files[i]);
-          
-          if (content) {
-            content = content.replace(/^(.+,)/, ""); // We strip out the info at the beginning of the file (mime type + encoding)
-            const fullPath = joinPathSegments([path ?? "", files[i].name]);
-
-            const uploadPromise = new Promise(async (resolve, reject) => {
-              try {
-                const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/files/${encodeURIComponent(fullPath)}`, {
-                  method: "POST",
-                  headers: { "Content-Type": "application/json" },
-                  body: JSON.stringify({
-                    type: "media",
-                    name: configMedia.name,
-                    content,
-                  }),
-                });
-                if (!response.ok) throw new Error(`Failed to upload file: ${response.status} ${response.statusText}`);
-
-                const data: any = await response.json();
-                
-                if (data.status !== "success") throw new Error(data.message);
-                
-                resolve(data);
-              } catch (error) {
-                reject(error);
-              }
-            });
-
-            toast.promise(uploadPromise, {
-              loading: `Uploading ${files[i].name}`,
-              success: (response: any) => {
-                onUpload?.(response.data);
-                return response.message;
-              },
-              error: (error: any) => error.message,
-            });
-          }
-        }
-      } catch (error) {
-        console.error(error);
+        const uploadPromise = new Promise((resolve, reject) => {
+          reader.onload = async () => {
+            try {
+              const content = (reader.result as string).replace(/^(.+,)/, "");
+              const fullPath = joinPathSegments([path ?? "", file.name]);
+
+              const response = await fetch(`/api/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/files/${encodeURIComponent(fullPath)}`, {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({
+                  type: "media",
+                  name: configMedia.name,
+                  content,
+                }),
+              });
+
+              if (!response.ok) throw new Error(`Failed to upload file: ${response.status} ${response.statusText}`);
+
+              const data = await response.json();
+              if (data.status !== "success") throw new Error(data.message);
+              
+              resolve(data);
+            } catch (error) {
+              reject(error);
+            }
+          };
+          reader.onerror = () => reject(new Error("Failed to read file"));
+        });
+
+        reader.readAsDataURL(file);
+
+        toast.promise(uploadPromise, {
+          loading: `Uploading ${file.name}`,
+          success: (data: any) => {
+            onUpload?.(data.data);
+            return data.message;
+          },
+          error: (error: any) => error.message,
+        });
       }
+    } catch (error) {
+      console.error(error);
     }
   }, [config, path, configMedia.name, onUpload]);
 
-  const handleTriggerClick = useCallback(() => {
-    if (fileInputRef.current) {
-      (fileInputRef.current as HTMLInputElement).click();
-    }
-  }, []);
+  const contextValue = useMemo(() => ({
+    handleFiles,
+    accept,
+    multiple
+  }), [handleFiles, accept, multiple]);
 
-  const trigger = useMemo(() => 
-    isValidElement(children)
-      ? cloneElement(children, { onClick: handleTriggerClick })
-      : null,
-    [children, handleTriggerClick]
+  return (
+    <MediaUploadContext.Provider value={contextValue}>
+      {children}
+    </MediaUploadContext.Provider>
   );
+}
+
+function MediaUploadTrigger({ children }: MediaUploadTriggerProps) {
+  const context = useContext(MediaUploadContext);
+  if (!context) throw new Error("MediaUploadTrigger must be used within a MediaUpload component");
+  
+  const fileInputRef = useRef<HTMLInputElement>(null);
+
+  const handleClick = useCallback(() => {
+    fileInputRef.current?.click();
+  }, []);
+
+  const handleFileInput = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
+    const files = event.target.files;
+    if (files && files.length > 0) {
+      context.handleFiles(files);
+    }
+  }, [context]);
 
   return (
     <>
@@ -124,13 +145,58 @@ const MediaUpload = ({
         type="file"
         ref={fileInputRef}
         onChange={handleFileInput}
-        accept={accept}
-        multiple
+        accept={context.accept}
+        multiple={context.multiple}
         hidden
       />
-      {trigger}
+      {cloneElement(children, { onClick: handleClick })}
     </>
   );
-};
+}
+
+function MediaUploadDropZone({ children, className }: MediaUploadDropZoneProps) {
+  const context = useContext(MediaUploadContext);
+  if (!context) throw new Error("MediaUploadDropZone must be used within a MediaUpload component");
+  
+  const [isDragging, setIsDragging] = useState(false);
+
+  const handleDragOver = useCallback((e: React.DragEvent) => {
+    e.preventDefault();
+    setIsDragging(true);
+  }, []);
+
+  const handleDragLeave = useCallback((e: React.DragEvent) => {
+    e.preventDefault();
+    setIsDragging(false);
+  }, []);
+
+  const handleDrop = useCallback((e: React.DragEvent) => {
+    e.preventDefault();
+    setIsDragging(false);
+    
+    if (e.dataTransfer.files && e.dataTransfer.files.length > 0) {
+      context.handleFiles(e.dataTransfer.files);
+    }
+  }, [context]);
+
+  return (
+    <div
+      onDragOver={handleDragOver}
+      onDragLeave={handleDragLeave}
+      onDrop={handleDrop}
+      className={cn("relative", className)}
+    >
+      {children}
+      {isDragging && (
+        <div className="absolute inset-0 bg-primary/10 rounded-lg flex items-center justify-center">
+          <p className="text-sm text-foreground font-medium bg-background/50 rounded-full px-3 py-1">Drop files here to upload</p>
+        </div>
+      )}
+    </div>
+  );
+}
 
-export { MediaUpload };
\ No newline at end of file
+export const MediaUpload = Object.assign(MediaUploadRoot, {
+  Trigger: MediaUploadTrigger,
+  DropZone: MediaUploadDropZone,
+});
\ No newline at end of file
diff --git a/components/media/media-view.tsx b/components/media/media-view.tsx
index 4358fb4f..16a46d83 100644
--- a/components/media/media-view.tsx
+++ b/components/media/media-view.tsx
@@ -277,80 +277,88 @@ const MediaView = ({
             <FolderPlus className="h-3.5 w-3.5"/>
           </Button>
         </FolderCreate>
-        <MediaUpload media={mediaConfig.name} path={path} onUpload={handleUpload}>
-          <Button type="button" size="sm" className="gap-2">
-            <Upload className="h-3.5 w-3.5"/>
-            Upload
-          </Button>
+        <MediaUpload media={mediaConfig.name} path={path} onUpload={handleUpload} extensions={filteredExtensions}>
+          <MediaUpload.Trigger>
+            <Button type="button" size="sm" className="gap-2">
+              <Upload className="h-3.5 w-3.5"/>
+              Upload
+            </Button>
+          </MediaUpload.Trigger>
         </MediaUpload>
       </header>
-      <div className="relative flex-1 overflow-auto scrollbar" ref={filesGridRef}>
-        {isLoading
-          ? loadingSkeleton
-          : filteredData && filteredData.length > 0
-              ? <ul className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-8 p-1">
-                  {filteredData.map((item, index) => 
-                    <li key={item.path}>
-                      {item.type === "dir"
-                        ? <button
-                            className="hover:bg-muted focus:ring-offset-background focus:ring-2 focus:ring-ring focus:ring-offset-2 outline-none rounded-md block w-full"
-                            onClick={() => handleNavigate(item.path)}
-                          >
-                            <div className="flex items-center justify-center aspect-video">
-                              <Folder className="stroke-[0.5] h-[5.5rem] w-[5.5rem]"/>
-                            </div>
-                            <div className="flex items-center justify-center p-2">
-                              <div className="overflow-hidden h-9">
-                                <div className="text-sm font-medium truncate">{item.name}</div>
-                              </div>
-                            </div>
-                          </button>
-                        : <label htmlFor={`item-${index}`}>
-                            {onSelect &&
-                              <input 
-                                type="checkbox" 
-                                id={`item-${index}`} 
-                                className="peer sr-only"
-                                checked={selected.includes(item.path)}
-                                onChange={() => handleSelect(item.path)}
-                              />
-                            }
-                            <div className={onSelect && "hover:bg-muted peer-focus:ring-offset-background peer-focus:ring-2 peer-focus:ring-ring peer-focus:ring-offset-2 rounded-md peer-checked:ring-offset-background peer-checked:ring-offset-2 peer-checked:ring-2 peer-checked:ring-ring relative"}>
-                              {extensionCategories.image.includes(item.extension)
-                                ? <Thumbnail name={mediaConfig.name} path={item.path} className="rounded-t-md aspect-video"/>
-                                : <div className="flex items-center justify-center rounded-md aspect-video">
-                                    <File className="stroke-[0.5] h-24 w-24"/>
+      <MediaUpload media={mediaConfig.name} path={path} onUpload={handleUpload} extensions={filteredExtensions}>
+        <MediaUpload.DropZone className="flex-1">
+          <div className="h-full relative flex flex-col">
+            <div className="flex-1 overflow-auto scrollbar" ref={filesGridRef}>
+              {isLoading
+                ? loadingSkeleton
+                : filteredData && filteredData.length > 0
+                  ? <ul className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-8 p-1">
+                      {filteredData.map((item, index) => 
+                        <li key={item.path}>
+                          {item.type === "dir"
+                            ? <button
+                                className="hover:bg-muted focus:ring-offset-background focus:ring-2 focus:ring-ring focus:ring-offset-2 outline-none rounded-md block w-full"
+                                onClick={() => handleNavigate(item.path)}
+                              >
+                                <div className="flex items-center justify-center aspect-video">
+                                  <Folder className="stroke-[0.5] h-[5.5rem] w-[5.5rem]"/>
+                                </div>
+                                <div className="flex items-center justify-center p-2">
+                                  <div className="overflow-hidden h-9">
+                                    <div className="text-sm font-medium truncate">{item.name}</div>
                                   </div>
-                              }
-                              <div className="flex gap-x-2 items-center p-2">
-                                <div className="overflow-hidden mr-auto h-9">
-                                  <div className="text-sm font-medium truncate">{item.name}</div>
-                                  <div className="text-xs text-muted-foreground truncate">{getFileSize(item.size)}</div>
                                 </div>
-                                <FileOptions path={item.path} sha={item.sha} type="media" name={mediaConfig.name} onDelete={handleDelete} onRename={handleRename} portalProps={{container: filesGridRef.current}}>
-                                  <Button variant="ghost" size="icon" className="shrink-0">
-                                    <EllipsisVertical className="h-4 w-4" />
-                                  </Button>
-                                </FileOptions>
-                              </div>
-                              {onSelect && selected.includes(item.path) &&
-                                <div className="text-primary-foreground bg-primary p-0.5 rounded-full absolute top-2 left-2">
-                                  <Check className="stroke-[3] w-3 h-3"/>
+                              </button>
+                            : <label htmlFor={`item-${index}`}>
+                                {onSelect &&
+                                  <input 
+                                    type="checkbox" 
+                                    id={`item-${index}`} 
+                                    className="peer sr-only"
+                                    checked={selected.includes(item.path)}
+                                    onChange={() => handleSelect(item.path)}
+                                  />
+                                }
+                                <div className={onSelect && "hover:bg-muted peer-focus:ring-offset-background peer-focus:ring-2 peer-focus:ring-ring peer-focus:ring-offset-2 rounded-md peer-checked:ring-offset-background peer-checked:ring-offset-2 peer-checked:ring-2 peer-checked:ring-ring relative"}>
+                                  {extensionCategories.image.includes(item.extension)
+                                    ? <Thumbnail name={mediaConfig.name} path={item.path} className="rounded-t-md aspect-video"/>
+                                    : <div className="flex items-center justify-center rounded-md aspect-video">
+                                        <File className="stroke-[0.5] h-24 w-24"/>
+                                      </div>
+                                  }
+                                  <div className="flex gap-x-2 items-center p-2">
+                                    <div className="overflow-hidden mr-auto h-9">
+                                      <div className="text-sm font-medium truncate">{item.name}</div>
+                                      <div className="text-xs text-muted-foreground truncate">{getFileSize(item.size)}</div>
+                                    </div>
+                                    <FileOptions path={item.path} sha={item.sha} type="media" name={mediaConfig.name} onDelete={handleDelete} onRename={handleRename} portalProps={{container: filesGridRef.current}}>
+                                      <Button variant="ghost" size="icon" className="shrink-0">
+                                        <EllipsisVertical className="h-4 w-4" />
+                                      </Button>
+                                    </FileOptions>
+                                  </div>
+                                  {onSelect && selected.includes(item.path) &&
+                                    <div className="text-primary-foreground bg-primary p-0.5 rounded-full absolute top-2 left-2">
+                                      <Check className="stroke-[3] w-3 h-3"/>
+                                    </div>
+                                  }
                                 </div>
-                              }
-                            </div>
-                          </label>
-                      }
-                      
-                    </li>
-                  )}
-                </ul>
-              : <p className="text-muted-foreground flex items-center justify-center text-sm p-6">
-                  <Ban className="h-4 w-4 mr-2"/>
-                  This folder is empty.
-                </p>
-        }
-      </div>
+                              </label>
+                          }
+                          
+                        </li>
+                      )}
+                    </ul>
+                  : <p className="text-muted-foreground flex items-center justify-center text-sm p-6">
+                      <Ban className="h-4 w-4 mr-2"/>
+                      This folder is empty.
+                    </p>
+              }
+            </div>
+          </div>
+        </MediaUpload.DropZone>
+      </MediaUpload>
     </div>
   )
 };
diff --git a/drizzle.config.ts b/drizzle.config.ts
index 2c32b6f5..946c5d2e 100644
--- a/drizzle.config.ts
+++ b/drizzle.config.ts
@@ -6,8 +6,8 @@ export default defineConfig({
   out: "./db/migrations",
   dialect: "sqlite",
   driver: (process.env.SQLITE_AUTH_TOKEN && process.env.SQLITE_AUTH_TOKEN !== "")
-    ? "turso"
-    : undefined,
+    ? ("turso" as const)
+    : (undefined as any),
   dbCredentials: {
     url: process.env.SQLITE_URL!,
     authToken: process.env.SQLITE_AUTH_TOKEN,
diff --git a/fields/core/file/edit-component.tsx b/fields/core/file/edit-component.tsx
index ce262770..22a03801 100644
--- a/fields/core/file/edit-component.tsx
+++ b/fields/core/file/edit-component.tsx
@@ -24,6 +24,61 @@ import { buttonVariants } from "@/components/ui/button";
 
 const generateId = () => uuidv4().slice(0, 8);
 
+const FileTeaser = ({ file, config, onRemove, getFileIcon }: { 
+  file: string;
+  config: any;
+  onRemove: (file: string) => void;
+  getFileIcon: (file: string) => React.ReactNode;
+}) => {
+  return (
+    <>
+      <div className="flex items-center overflow-hidden">
+        {getFileIcon(file)}
+        <span className="ml-1 font-medium whitespace-nowrap">{getFileName(file)}</span>
+        <span className="ml-2 text-muted-foreground truncate">{file}</span>
+      </div>
+
+      <div className="flex items-center">
+        <TooltipProvider>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <a
+                href={`https://github.com/${config.owner}/${config.repo}/blob/${config.branch}/${file}`}
+                target="_blank"
+                className={cn(buttonVariants({ variant: "ghost", size: "icon-xs" }), "text-muted-foreground hover:text-foreground transition-colors")}
+              >
+                <ArrowUpRight className="h-4 w-4" />
+              </a>
+            </TooltipTrigger>
+            <TooltipContent>
+              See on GitHub
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+
+        <TooltipProvider>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Button
+                type="button"
+                variant="ghost"
+                size="icon-xs"
+                onClick={() => onRemove(file)}
+                className="h-8 w-8 p-0 text-muted-foreground hover:text-foreground transition-colors"
+              >
+                <Trash2 className="h-4 w-4" />
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>
+              Remove
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+      </div>
+    </>
+  )
+};
+
 const SortableItem = ({ id, file, config, onRemove, getFileIcon }: { 
   id: string;
   file: string;
@@ -57,49 +112,7 @@ const SortableItem = ({ id, file, config, onRemove, getFileIcon }: {
         >
           <GripVertical className="h-4 w-4" />
         </div>
-        <div className="flex items-center overflow-hidden">
-          {getFileIcon(file)}
-          <span className="ml-1 font-medium whitespace-nowrap">{getFileName(file)}</span>
-          <span className="ml-2 text-muted-foreground truncate">{file}</span>
-        </div>
-
-        <div className="flex items-center">
-          <TooltipProvider>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <a
-                  href={`https://github.com/${config.owner}/${config.repo}/blob/${config.branch}/${file}`}
-                  target="_blank"
-                  className={cn(buttonVariants({ variant: "ghost", size: "icon-xs" }), "text-muted-foreground hover:text-foreground transition-colors")}
-                >
-                  <ArrowUpRight className="h-4 w-4" />
-                </a>
-              </TooltipTrigger>
-              <TooltipContent>
-                See on GitHub
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-
-          <TooltipProvider>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="icon-xs"
-                  onClick={() => onRemove(file)}
-                  className="h-8 w-8 p-0 text-muted-foreground hover:text-foreground transition-colors"
-                >
-                  <Trash2 className="h-4 w-4" />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent>
-                Remove
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        </div>
+        <FileTeaser file={file} config={config} onRemove={onRemove} getFileIcon={getFileIcon} />
       </div>
     </div>
   );
@@ -108,7 +121,7 @@ const SortableItem = ({ id, file, config, onRemove, getFileIcon }: {
 const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>) => {
   const { value, field, onChange } = props;
   const { config } = useConfig();
-
+  
   const [files, setFiles] = useState<Array<{ id: string, path: string }>>(() => 
     value
       ? Array.isArray(value)
@@ -159,7 +172,7 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
   }, [field.options?.extensions, field.options?.categories, mediaConfig]);
 
   const isMultiple = useMemo(() => 
-    field.options?.multiple !== undefined && field.options?.multiple !== false,
+    field.options?.multiple === true,
     [field.options?.multiple]
   );
 
@@ -276,61 +289,73 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
   }
 
   return (
-    <div className="space-y-2">
-      <div className="space-y-2">
-        <DndContext 
-          sensors={sensors}
-          collisionDetection={closestCenter}
-          onDragEnd={handleDragEnd}
-        >
-          <SortableContext 
-            items={files.map(f => f.id)}
-            strategy={verticalListSortingStrategy}
-          >
-            {files.map((file) => (
-              <SortableItem 
-                key={file.id}
-                id={file.id}
-                file={file.path}
-                config={config}
-                onRemove={() => handleRemove(file.id)}
-                getFileIcon={getFileIcon}
-              />
-            ))}
-          </SortableContext>
-        </DndContext>
-      </div>
-      {remainingSlots > 0 && (
-        <div className="flex gap-2">
-          <MediaUpload path={rootPath} media={mediaConfig.name} extensions={allowedExtensions} onUpload={handleUpload}>
-            <Button type="button" size="sm" variant="outline" className="gap-2">
-              <Upload className="h-3.5 w-3.5"/>
-              Upload
-            </Button>
-          </MediaUpload>
-          <TooltipProvider>
-            <Tooltip>
-              <MediaDialog
-                media={mediaConfig.name}
-                initialPath={rootPath}
-                maxSelected={remainingSlots}
-                extensions={allowedExtensions}
-                onSubmit={handleSelected}
-              >
-                <TooltipTrigger asChild>
-                  <Button type="button" size="icon-sm" variant="outline">
-                    <FolderOpen className="h-3.5 w-3.5"/>
-                  </Button>
-                </TooltipTrigger>
-              </MediaDialog>
-              <TooltipContent>
-                Select from media
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
+    <MediaUpload path={rootPath} media={mediaConfig.name} extensions={allowedExtensions} onUpload={handleUpload} multiple={isMultiple}>
+      <MediaUpload.DropZone>
+        <div className="space-y-2">
+          {files.length > 0 && (
+            isMultiple ? (
+              <div className="space-y-2">
+                <DndContext 
+                  sensors={sensors}
+                  collisionDetection={closestCenter}
+                  onDragEnd={handleDragEnd}
+                >
+                  <SortableContext 
+                    items={files.map(f => f.id)}
+                    strategy={verticalListSortingStrategy}
+                  >
+                    {files.map((file) => (
+                      <SortableItem 
+                        key={file.id}
+                        id={file.id}
+                        file={file.path}
+                        config={config}
+                        onRemove={() => handleRemove(file.id)}
+                        getFileIcon={getFileIcon}
+                      />
+                    ))}
+                  </SortableContext>
+                </DndContext>
+              </div>
+            ) : (
+              <div className="grid grid-cols-[1fr_auto] items-center gap-2 pl-3 pr-1 bg-muted rounded-md h-10">
+                <FileTeaser file={files[0].path} config={config} onRemove={() => handleRemove(files[0].id)} getFileIcon={getFileIcon} />
+              </div>
+            )
+          )}
+          {remainingSlots > 0 && (
+            <div className="flex gap-2">
+              <MediaUpload.Trigger>
+                <Button type="button" size="sm" variant="outline" className="gap-2">
+                  <Upload className="h-3.5 w-3.5"/>
+                  Upload
+                </Button>
+              </MediaUpload.Trigger>
+              <TooltipProvider>
+                <Tooltip>
+                  <MediaDialog
+                    media={mediaConfig.name}
+                    initialPath={rootPath}
+                    maxSelected={remainingSlots}
+                    extensions={allowedExtensions}
+                    onSubmit={handleSelected}
+                  >
+                    <TooltipTrigger asChild>
+                      <Button type="button" size="icon-sm" variant="outline">
+                        <FolderOpen className="h-3.5 w-3.5"/>
+                      </Button>
+                    </TooltipTrigger>
+                  </MediaDialog>
+                  <TooltipContent>
+                    Select from media
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            </div>
+          )}
         </div>
-      )}
-    </div>
+      </MediaUpload.DropZone>
+    </MediaUpload>
   );
 });
 
diff --git a/fields/core/image/edit-component.tsx b/fields/core/image/edit-component.tsx
index da1b8f6d..04b280ba 100644
--- a/fields/core/image/edit-component.tsx
+++ b/fields/core/image/edit-component.tsx
@@ -1,120 +1,212 @@
 "use client";
 
-import { forwardRef, useCallback, useMemo, useState } from "react";
-import { getParentPath } from "@/lib/utils/file";
-import { MediaDialog } from "@/components/media/media-dialog";
-import { Thumbnail } from "@/components/thumbnail";
+import { forwardRef, useCallback, useState, useEffect, useMemo } from "react";
 import { Button } from "@/components/ui/button";
-import {
-  DndContext, 
-  closestCenter,
-  KeyboardSensor,
-  PointerSensor,
-  useSensor,
-  useSensors,
-} from "@dnd-kit/core";
-import {
-  arrayMove,
-  SortableContext,
-  sortableKeyboardCoordinates,
-  useSortable,
-  rectSortingStrategy
-} from "@dnd-kit/sortable";
-import { CSS } from "@dnd-kit/utilities";
-import { Pencil, Trash2, ImagePlus } from "lucide-react";
+import { MediaUpload } from "@/components/media/media-upload";
+import { MediaDialog } from "@/components/media/media-dialog";
+import { Trash2, Upload, FolderOpen, ArrowUpRight } from "lucide-react";
 import { useConfig } from "@/contexts/config-context";
+import { extensionCategories, normalizePath } from "@/lib/utils/file";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
+import { arrayMove, SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy, rectSortingStrategy } from '@dnd-kit/sortable';
+import { useSortable } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+import { v4 as uuidv4 } from 'uuid';
+import { getSchemaByName } from "@/lib/schema";
+import { cn } from "@/lib/utils";
+import { buttonVariants } from "@/components/ui/button";
+import { Thumbnail } from "@/components/thumbnail";
 
-// TODO: disable sortable for single image
-// TODO: make component resilient to illegal parentPath
-
-const SortableItem = ({
-  id,
-  path,
-  media,
-  children
-}: {
-  id: string,
-  path: string,
-  media: string,
-  children: React.ReactNode
+const generateId = () => uuidv4().slice(0, 8);
+
+const ImageTeaser = ({ file, config, media, onRemove }: { 
+  file: string;
+  config: any;
+  media: string;
+  onRemove: (file: string) => void;
+}) => {
+  return (
+    <>
+      <div className="absolute bottom-1 right-1">
+        <TooltipProvider>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <a
+                href={`https://github.com/${config.owner}/${config.repo}/blob/${config.branch}/${file}`}
+                target="_blank"
+                className={cn(buttonVariants({ variant: "secondary", size: "icon-xs" }), "rounded-r-none")}
+              >
+                <ArrowUpRight className="h-4 w-4" />
+              </a>
+            </TooltipTrigger>
+            <TooltipContent>
+              See on GitHub
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+
+        <TooltipProvider>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Button
+                type="button"
+                size="icon-xs"
+                variant="secondary"
+                onClick={() => onRemove(file)}
+                className="rounded-l-none"
+              >
+                <Trash2 className="h-4 w-4" />
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>
+              Remove
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+      </div>
+    </>
+  )
+};
+
+const SortableItem = ({ id, file, config, media, onRemove }: { 
+  id: string;
+  file: string;
+  config: any;
+  media: string;
+  onRemove: (file: string) => void;
 }) => {
   const {
     attributes,
-    isDragging,
     listeners,
     setNodeRef,
     transform,
     transition,
-  } = useSortable({ id });
+    isDragging
+  } = useSortable({ id: id });
 
   const style = {
     transform: CSS.Transform.toString(transform),
     transition,
-    zIndex: isDragging ? 1000 : "auto"
+    opacity: isDragging ? 0.5 : 1,
+    zIndex: isDragging ? 1 : 0,
+    position: 'relative' as const
   };
 
-  // const name = field.options?;
-
   return (
     <div ref={setNodeRef} style={style}>
-      <div className="relative w-28">
-        <div {...attributes} {...listeners}>
-          <Thumbnail name={media} path={path} className="aspect-square rounded-md outline-none"/>
-        </div>
-        {children}
+      <div {...attributes} {...listeners}>
+        <Thumbnail name={media} path={file} className="rounded-md w-28 h-28"/>
       </div>
+      <ImageTeaser file={file} config={config} onRemove={onRemove} media={media} />
     </div>
   );
 };
 
 const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>) => {
   const { value, field, onChange } = props;
-  const [images, setImages] = useState<{ id: string, path: string }[]>(() => 
+  const { config } = useConfig();
+  
+  const [files, setFiles] = useState<Array<{ id: string, path: string }>>(() => 
     value
       ? Array.isArray(value)
-        ? value.map((path, index) => ({ id: `image-${index}`, path }))
-        : [{ id: "image-0", path: value }]
+        ? value.map(path => ({ id: generateId(), path }))
+        : [{ id: generateId(), path: value }]
       : []
   );
 
-  const { config } = useConfig();
+  const mediaConfig = useMemo(() => {
+    if (!config?.object?.media?.length) {
+      return undefined;
+    }
+    return field.options?.media
+      ? getSchemaByName(config.object, field.options?.media, "media")
+      : config.object.media[0];
+  }, [field.options?.media, config?.object]);
 
-  const mediaName = field.options?.media || config?.object.media[0].name;
-  
-  const maxImages = useMemo(() => {
-    if (field.list && typeof field.list.max === 'number') {
-      return field.list.max;
+  const rootPath = useMemo(() => {
+    if (!field.options?.path) {
+      return mediaConfig?.input;
     }
-    return field.list ? undefined : 1;
-  }, [field]);
 
-  const handleRemove = useCallback((index: number) => {
-    let newImages = [...images];
-    newImages.splice(index, 1);
-    
-    if (newImages.length === 0) {
-      setImages([]);
-      onChange(field.list ? [] : "");
-    } else { 
-      setImages(newImages);
-      field.list
-        ? onChange(newImages.map((item: any) => item.path))
-        : onChange(newImages[0].path);
+    const normalizedPath = normalizePath(field.options.path);
+    const normalizedMediaPath = normalizePath(mediaConfig?.input);
+
+    if (!normalizedPath.startsWith(normalizedMediaPath)) {
+      console.warn(`"${field.options.path}" is not within media root "${mediaConfig?.input}". Defaulting to media root.`);
+      return mediaConfig?.input;
     }
-  }, [field, images, onChange]);
-
-  const handleSubmit = useCallback((newImages: string[]) => {
-    if (newImages.length === 0) {
-      setImages([]);
-      onChange(field.list ? [] : "");
-    } else {    
-      const newImagesObjects = newImages.map((path: string, index: number) => ({ id: `image-${index}`, path }));
-      setImages(newImagesObjects);
-      field.list
-        ? onChange(newImagesObjects.map((item: any) => item.path))
-        : onChange(newImagesObjects[0].path);
+
+    return normalizedPath;
+  }, [field.options?.path, mediaConfig?.input]);
+
+  const allowedExtensions = useMemo(() => {
+    if (!mediaConfig) return [];
+
+    // Start with image extensions
+    let extensions = extensionCategories['image'];
+
+    // Apply field-level extensions/categories if specified
+    const fieldExtensions = field.options?.extensions 
+      ? field.options.extensions
+      : field.options?.categories
+        ? field.options.categories.flatMap((category: string) => extensionCategories[category])
+        : [];
+
+    if (fieldExtensions.length) {
+      extensions = extensions.filter(ext => fieldExtensions.includes(ext));
+    }
+
+    // Finally, filter by media config extensions if they exist
+    if (mediaConfig.extensions) {
+      extensions = extensions.filter(ext => mediaConfig.extensions.includes(ext));
+    }
+
+    return extensions;
+  }, [field.options?.extensions, field.options?.categories, mediaConfig]);
+
+  const isMultiple = useMemo(() => 
+    field.options?.multiple === true,
+    [field.options?.multiple]
+  );
+
+  const remainingSlots = useMemo(() => 
+    field.options?.multiple
+      ? field.options.multiple.max
+        ? field.options.multiple.max - files.length
+        : Infinity
+      : 1 - files.length,
+    [field.options?.multiple, files.length]
+  );
+
+  useEffect(() => {
+    if (isMultiple) {
+      onChange(files.map(f => f.path));
+    } else {
+      onChange(files[0]?.path || undefined);
+    }
+  }, [files, isMultiple, onChange]);
+
+  const handleUpload = useCallback((fileData: any) => {
+    if (!config) return;
+    
+    const newFile = { id: generateId(), path: fileData.path };
+    
+    if (isMultiple) {
+      setFiles(prev => [...prev, newFile]);
+    } else {
+      setFiles([newFile]);
     }
-  }, [field, onChange]);
+  }, [isMultiple, config]);
+
+  const handleRemove = useCallback((fileId: string) => {
+    setFiles(prev => prev.filter(file => file.id !== fileId));
+  }, []);
 
   const sensors = useSensors(
     useSensor(PointerSensor),
@@ -125,60 +217,118 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
 
   const handleDragEnd = (event: any) => {
     const { active, over } = event;
+
     if (active.id !== over.id) {
-      let newImages = images;
-      const oldIndex = newImages.findIndex(item => item.id === active.id);
-      const newIndex = newImages.findIndex(item => item.id === over.id);
-      newImages = arrayMove(newImages, oldIndex, newIndex);
-      setImages(newImages);
-      onChange(newImages.map((item: any) => item.path));
+      setFiles((items) => {
+        const oldIndex = items.findIndex(item => item.id === active.id);
+        const newIndex = items.findIndex(item => item.id === over.id);
+        return arrayMove(items, oldIndex, newIndex);
+      });
     }
   };
 
+  const handleSelected = useCallback((newPaths: string[]) => {
+    if (newPaths.length === 0) {
+      setFiles([]);
+    } else {
+      const newFiles = newPaths.map(path => ({
+        id: generateId(),
+        path
+      }));
+      
+      if (isMultiple) {
+        setFiles(prev => [...prev, ...newFiles]);
+      } else {
+        setFiles([newFiles[0]]);
+      }
+    }
+  }, [isMultiple]);
+
+  if (!mediaConfig) {
+    return (
+      <div className="text-muted-foreground bg-muted rounded-md px-3 py-2 h-10">
+      No media configuration found. {' '}
+      <a 
+        href={`/${config?.owner}/${config?.repo}/${encodeURIComponent(config?.branch || "")}/settings`}
+        className="underline hover:text-foreground"
+      >
+        Check your settings
+      </a>.
+    </div>
+    );
+  }
+
   return (
-    <DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
-      <SortableContext items={images} strategy={rectSortingStrategy}>
-        {/* <div className="grid grid-flow-col auto-cols-max gap-4"> */}
-        <div className="flex flex-wrap gap-4 items-start">
-
-          {images.map((item, index) => 
-            <SortableItem key={item.id} id={item.id} path={item.path} media={mediaName}>
-              <footer className="absolute bottom-2 right-2">
-                <Button type="button" size="icon-xs" variant="outline" className="rounded-r-none focus-visible:ring-0 focus-visible:ring-offset-0 focus-visible:bg-muted" onClick={() => handleRemove(index)}>
-                  <Trash2 className="h-4 w-4" />
-                </Button>
-                <MediaDialog
-                  selected={images.map((image: any) => image.path)}
-                  onSubmit={handleSubmit}
-                  maxSelected={maxImages}
-                  initialPath={getParentPath(item.path)}
+    <MediaUpload path={rootPath} media={mediaConfig.name} extensions={allowedExtensions} onUpload={handleUpload} multiple={isMultiple}>
+      <MediaUpload.DropZone>
+        <div className="space-y-2">
+          {files.length > 0 && (
+            isMultiple ? (
+              <div className="flex flex-wrap gap-2">
+                <DndContext 
+                  sensors={sensors}
+                  collisionDetection={closestCenter}
+                  onDragEnd={handleDragEnd}
                 >
-                  <Button type="button" size="icon-xs" variant="outline" className="rounded-l-none border-l-0 focus-visible:ring-0 focus-visible:ring-offset-0 focus-visible:bg-muted">
-                    <Pencil className="h-4 w-4" />
-                  </Button>
-                </MediaDialog>
-              </footer>
-            </SortableItem>
+                  <SortableContext 
+                    items={files.map(f => f.id)}
+                    strategy={rectSortingStrategy}
+                  >
+                    {files.map((file) => (
+                      <SortableItem 
+                        key={file.id}
+                        id={file.id}
+                        file={file.path}
+                        config={config}
+                        media={mediaConfig.name}
+                        onRemove={() => handleRemove(file.id)}
+                      />
+                    ))}
+                  </SortableContext>
+                </DndContext>
+              </div>
+            ) : (
+              <div className="aspect-square w-24 bg-red-600/50">
+                <ImageTeaser file={files[0].path} config={config} media={mediaConfig.name} onRemove={() => handleRemove(files[0].id)} />
+              </div>
+            )
+          )}
+          {remainingSlots > 0 && (
+            <div className="flex gap-2">
+              <MediaUpload.Trigger>
+                <Button type="button" size="sm" variant="outline" className="gap-2">
+                  <Upload className="h-3.5 w-3.5"/>
+                  Upload
+                </Button>
+              </MediaUpload.Trigger>
+              <TooltipProvider>
+                <Tooltip>
+                  <MediaDialog
+                    media={mediaConfig.name}
+                    initialPath={rootPath}
+                    maxSelected={remainingSlots}
+                    extensions={allowedExtensions}
+                    onSubmit={handleSelected}
+                  >
+                    <TooltipTrigger asChild>
+                      <Button type="button" size="icon-sm" variant="outline">
+                        <FolderOpen className="h-3.5 w-3.5"/>
+                      </Button>
+                    </TooltipTrigger>
+                  </MediaDialog>
+                  <TooltipContent>
+                    Select from media
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            </div>
           )}
-          {(!maxImages || images.length < maxImages) && 
-            <MediaDialog
-              selected={images.map((image: any) => image.path)}
-              onSubmit={handleSubmit}
-              maxSelected={maxImages}
-              initialPath={field.options?.path}
-            >
-              <Button type="button" variant="outline" className="h-28 w-28">
-                <div className="flex flex-col items-center gap-y-1 text-sm">
-                  <ImagePlus className="h-5 w-5 stroke-[1.5] text-foreground" />
-                  <div>Add image</div>
-                </div>
-              </Button>
-            </MediaDialog>
-          }
         </div>
-      </SortableContext>
-    </DndContext>
+      </MediaUpload.DropZone>
+    </MediaUpload>
   );
 });
 
+EditComponent.displayName = "EditComponent";
+
 export { EditComponent };
\ No newline at end of file
diff --git a/fields/core/image/index.tsx b/fields/core/image/index.tsx
index 8943c841..7fd28106 100644
--- a/fields/core/image/index.tsx
+++ b/fields/core/image/index.tsx
@@ -1,28 +1,46 @@
+import { z } from "zod";
 import { ViewComponent } from "./view-component";
 import { EditComponent } from "./edit-component";
 import { Field } from "@/types/field";
 import { swapPrefix } from "@/lib/githubImage";
 
-const read = (value: any, field: Field, config: Record<string, any>) => {
+const read = (value: any, field: Field, config: Record<string, any>): string | string[] | null => {
   if (!value) return null;
+  if (Array.isArray(value) && !value.length) return null;
   
   const prefixInput = field.options?.input ?? config.object.media?.input;
   const prefixOutput = field.options?.output ?? config.object.media?.output;
 
+  if (Array.isArray(value)) {
+    return value.map(v => read(v, field, config)) as string[];
+  }
+
   return swapPrefix(value, prefixOutput, prefixInput, true);
 };
 
-const write = (value: any, field: Field, config: Record<string, any>) => {
+const write = (value: any, field: Field, config: Record<string, any>): string | string[] | null => {
   if (!value) return null;
+  if (Array.isArray(value) && !value.length) return null;
 
   const prefixInput = field.options?.input ?? config.object.media?.input;
   const prefixOutput = field.options?.output ?? config.object.media?.output;
 
+  if (Array.isArray(value)) {
+    return value.map(v => write(v, field, config)) as string[];
+  }
+
   return swapPrefix(value, prefixInput, prefixOutput);
 };
 
-// TODO: add image validation
+// TODO: add validation for media path and file extension
+const schema = (field: Field) => {
+  let zodSchema: z.ZodTypeAny = z.coerce.string();
 
-const supportsList = true;
+  if (field.options?.multiple) zodSchema = z.array(zodSchema);
+  
+  if (!field.required) zodSchema = zodSchema.optional();
+  
+  return zodSchema;
+};
 
-export { ViewComponent, EditComponent, read, write, supportsList };
\ No newline at end of file
+export { schema, ViewComponent, EditComponent, read, write };
\ No newline at end of file
diff --git a/lib/configSchema.ts b/lib/configSchema.ts
index 6e2c1227..971e25e7 100644
--- a/lib/configSchema.ts
+++ b/lib/configSchema.ts
@@ -70,7 +70,7 @@ const FieldObjectSchema: z.ZodType<any> = z.lazy(() => z.object({
   ]).optional(),
   description: z.string().optional().nullable(),
   type: z.enum([
-    "boolean", "code", "date", "file", "image", "number", "object", "rich-text",
+    "boolean", "code", "date", "file", "image", "number", "object", "reference", "rich-text",
     "select", "string", "text", "uuid"
   ], {
     message: "'type' is required and must be set to a valid field type (see documentation)."

From a94f1f33141ff2b77f2d61d5206b377edd0a16bf Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 19 Mar 2025 10:10:02 +0800
Subject: [PATCH 53/95] Adding file extensions validation on drag and drop

---
 components/media/media-upload.tsx   | 49 ++++++++++++++++++++++++++---
 fields/core/file/edit-component.tsx | 18 +++++------
 2 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/components/media/media-upload.tsx b/components/media/media-upload.tsx
index ea39632a..15f3f3db 100644
--- a/components/media/media-upload.tsx
+++ b/components/media/media-upload.tsx
@@ -134,7 +134,26 @@ function MediaUploadTrigger({ children }: MediaUploadTriggerProps) {
 
   const handleFileInput = useCallback((event: React.ChangeEvent<HTMLInputElement>) => {
     const files = event.target.files;
-    if (files && files.length > 0) {
+    if (!files || files.length === 0) return;
+
+    const acceptedExtensions = context.accept?.split(',').map(ext => ext.trim().toLowerCase());
+    if (acceptedExtensions?.length) {
+      const validFiles = Array.from(files).filter(file => {
+        const ext = `.${file.name.split('.').pop()?.toLowerCase()}`;
+        return acceptedExtensions.includes(ext);
+      });
+
+      if (validFiles.length === 0) {
+        toast.error(`Invalid file type. Allowed: ${context.accept}`);
+        return;
+      }
+
+      if (validFiles.length !== files.length) {
+        toast.error(`Some files were skipped. Allowed: ${context.accept}`);
+      }
+
+      context.handleFiles(validFiles as unknown as FileList);
+    } else {
       context.handleFiles(files);
     }
   }, [context]);
@@ -174,8 +193,28 @@ function MediaUploadDropZone({ children, className }: MediaUploadDropZoneProps)
     e.preventDefault();
     setIsDragging(false);
     
-    if (e.dataTransfer.files && e.dataTransfer.files.length > 0) {
-      context.handleFiles(e.dataTransfer.files);
+    const files = e.dataTransfer.files;
+    if (!files || files.length === 0) return;
+
+    const acceptedExtensions = context.accept?.split(',').map(ext => ext.trim().toLowerCase());
+    if (acceptedExtensions?.length) {
+      const validFiles = Array.from(files).filter(file => {
+        const ext = `.${file.name.split('.').pop()?.toLowerCase()}`;
+        return acceptedExtensions.includes(ext);
+      });
+
+      if (validFiles.length === 0) {
+        toast.error(`Invalid file type. Allowed: ${context.accept}`);
+        return;
+      }
+
+      if (validFiles.length !== files.length) {
+        toast.error(`Some files were skipped. Allowed: ${context.accept}`);
+      }
+
+      context.handleFiles(validFiles as unknown as FileList);
+    } else {
+      context.handleFiles(files);
     }
   }, [context]);
 
@@ -189,7 +228,9 @@ function MediaUploadDropZone({ children, className }: MediaUploadDropZoneProps)
       {children}
       {isDragging && (
         <div className="absolute inset-0 bg-primary/10 rounded-lg flex items-center justify-center">
-          <p className="text-sm text-foreground font-medium bg-background/50 rounded-full px-3 py-1">Drop files here to upload</p>
+          <p className="text-sm text-foreground font-medium bg-background rounded-full px-3 py-1">
+            Drop files here to upload
+          </p>
         </div>
       )}
     </div>
diff --git a/fields/core/file/edit-component.tsx b/fields/core/file/edit-component.tsx
index 22a03801..ea2eafb7 100644
--- a/fields/core/file/edit-component.tsx
+++ b/fields/core/file/edit-component.tsx
@@ -215,23 +215,23 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
       if (extensions.includes(ext)) {
         switch (category) {
           case 'image':
-            return <FileImage className="h-4 w-4" />;
+            return <FileImage className="h-4 w-4 shrink-0" />;
           case 'document':
-            return <FileText className="h-4 w-4" />;
+            return <FileText className="h-4 w-4 shrink-0" />;
           case 'video':
-            return <FileVideo className="h-4 w-4" />;
+            return <FileVideo className="h-4 w-4 shrink-0" />;
           case 'audio':
-            return <FileAudio className="h-4 w-4" />;
+            return <FileAudio className="h-4 w-4 shrink-0" />;
           case 'compressed':
-            return <FileArchive className="h-4 w-4" />;
+            return <FileArchive className="h-4 w-4 shrink-0" />;
           case 'code':
-            return <FileCode className="h-4 w-4" />;
+            return <FileCode className="h-4 w-4 shrink-0" />;
           case 'font':
-            return <FileType className="h-4 w-4" />;
+            return <FileType className="h-4 w-4 shrink-0" />;
           case 'spreadsheet':
-            return <FileSpreadsheet className="h-4 w-4" />;
+            return <FileSpreadsheet className="h-4 w-4 shrink-0" />;
           default:
-            return <FileText className="h-4 w-4" />;
+            return <FileText className="h-4 w-4 shrink-0" />;
         }
       }
     }

From 38352bf3fe9a125075af2918fa55dea03e5d7ce4 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 19 Mar 2025 11:32:12 +0800
Subject: [PATCH 54/95] Updating read/write functions to account for new media
 config

---
 .../[branch]/media/[name]/[path]/route.ts     |  2 +-
 components/thumbnail.tsx                      |  2 +
 fields/core/file/index.tsx                    | 23 +++--
 fields/core/image/index.tsx                   | 23 +++--
 fields/core/rich-text/edit-component.tsx      | 91 +++++++++++++++++--
 fields/core/rich-text/index.tsx               | 23 +++--
 6 files changed, 136 insertions(+), 28 deletions(-)

diff --git a/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
index 1de79ddf..3f6692bd 100644
--- a/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
@@ -37,7 +37,7 @@ export async function GET(
     }
 
     const normalizedPath = normalizePath(params.path);
-    if (!normalizedPath.startsWith(mediaConfig.input)) throw new Error(`Invalid path "${params.path}" for media.`);
+    if (!normalizedPath.startsWith(mediaConfig.input)) throw new Error(`Invalid path "${params.path}" for media "${params.name}".`);
 
     const { searchParams } = new URL(request.url);
     const nocache = searchParams.get('nocache');
diff --git a/components/thumbnail.tsx b/components/thumbnail.tsx
index 5f8562e2..a9fa4a17 100644
--- a/components/thumbnail.tsx
+++ b/components/thumbnail.tsx
@@ -34,6 +34,8 @@ export function Thumbnail({
           const url = await getRawUrl(owner, repo, branch, name, path, isPrivate);
           setRawUrl(url);
         } catch (error: any) {
+          const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+          console.warn(errorMessage);
           setError(error.message);
         }
       }
diff --git a/fields/core/file/index.tsx b/fields/core/file/index.tsx
index 7fd28106..8f712ba6 100644
--- a/fields/core/file/index.tsx
+++ b/fields/core/file/index.tsx
@@ -3,33 +3,44 @@ import { ViewComponent } from "./view-component";
 import { EditComponent } from "./edit-component";
 import { Field } from "@/types/field";
 import { swapPrefix } from "@/lib/githubImage";
+import { getSchemaByName } from "@/lib/schema";
 
 const read = (value: any, field: Field, config: Record<string, any>): string | string[] | null => {
   if (!value) return null;
   if (Array.isArray(value) && !value.length) return null;
   
-  const prefixInput = field.options?.input ?? config.object.media?.input;
-  const prefixOutput = field.options?.output ?? config.object.media?.output;
+  const mediaConfig = field.options?.media === false
+    ? undefined
+    : field.options?.media && typeof field.options.media === 'string'
+      ? getSchemaByName(config.object, field.options.media, "media")
+      : config.object.media[0];
+
+  if (!mediaConfig) return value;
 
   if (Array.isArray(value)) {
     return value.map(v => read(v, field, config)) as string[];
   }
 
-  return swapPrefix(value, prefixOutput, prefixInput, true);
+  return swapPrefix(value, mediaConfig.output, mediaConfig.input, true);
 };
 
 const write = (value: any, field: Field, config: Record<string, any>): string | string[] | null => {
   if (!value) return null;
   if (Array.isArray(value) && !value.length) return null;
 
-  const prefixInput = field.options?.input ?? config.object.media?.input;
-  const prefixOutput = field.options?.output ?? config.object.media?.output;
+  const mediaConfig = field.options?.media === false
+    ? undefined
+    : field.options?.media && typeof field.options.media === 'string'
+      ? getSchemaByName(config.object, field.options.media, "media")
+      : config.object.media[0];
+
+  if (!mediaConfig) return value;
 
   if (Array.isArray(value)) {
     return value.map(v => write(v, field, config)) as string[];
   }
 
-  return swapPrefix(value, prefixInput, prefixOutput);
+  return swapPrefix(value, mediaConfig.input, mediaConfig.output);
 };
 
 // TODO: add validation for media path and file extension
diff --git a/fields/core/image/index.tsx b/fields/core/image/index.tsx
index 7fd28106..8f712ba6 100644
--- a/fields/core/image/index.tsx
+++ b/fields/core/image/index.tsx
@@ -3,33 +3,44 @@ import { ViewComponent } from "./view-component";
 import { EditComponent } from "./edit-component";
 import { Field } from "@/types/field";
 import { swapPrefix } from "@/lib/githubImage";
+import { getSchemaByName } from "@/lib/schema";
 
 const read = (value: any, field: Field, config: Record<string, any>): string | string[] | null => {
   if (!value) return null;
   if (Array.isArray(value) && !value.length) return null;
   
-  const prefixInput = field.options?.input ?? config.object.media?.input;
-  const prefixOutput = field.options?.output ?? config.object.media?.output;
+  const mediaConfig = field.options?.media === false
+    ? undefined
+    : field.options?.media && typeof field.options.media === 'string'
+      ? getSchemaByName(config.object, field.options.media, "media")
+      : config.object.media[0];
+
+  if (!mediaConfig) return value;
 
   if (Array.isArray(value)) {
     return value.map(v => read(v, field, config)) as string[];
   }
 
-  return swapPrefix(value, prefixOutput, prefixInput, true);
+  return swapPrefix(value, mediaConfig.output, mediaConfig.input, true);
 };
 
 const write = (value: any, field: Field, config: Record<string, any>): string | string[] | null => {
   if (!value) return null;
   if (Array.isArray(value) && !value.length) return null;
 
-  const prefixInput = field.options?.input ?? config.object.media?.input;
-  const prefixOutput = field.options?.output ?? config.object.media?.output;
+  const mediaConfig = field.options?.media === false
+    ? undefined
+    : field.options?.media && typeof field.options.media === 'string'
+      ? getSchemaByName(config.object, field.options.media, "media")
+      : config.object.media[0];
+
+  if (!mediaConfig) return value;
 
   if (Array.isArray(value)) {
     return value.map(v => write(v, field, config)) as string[];
   }
 
-  return swapPrefix(value, prefixInput, prefixOutput);
+  return swapPrefix(value, mediaConfig.input, mediaConfig.output);
 };
 
 // TODO: add validation for media path and file extension
diff --git a/fields/core/rich-text/edit-component.tsx b/fields/core/rich-text/edit-component.tsx
index c6ddcd49..8ad3bf53 100644
--- a/fields/core/rich-text/edit-component.tsx
+++ b/fields/core/rich-text/edit-component.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { forwardRef, useCallback, useRef, useState } from "react";
+import { forwardRef, useCallback, useRef, useState, useMemo } from "react";
 import { BubbleMenu, EditorContent, useEditor } from "@tiptap/react";
 import StarterKit from "@tiptap/starter-kit";
 import Image from "@tiptap/extension-image";
@@ -58,13 +58,50 @@ import {
   Trash2,
   Underline as UnderlineIcon
 } from "lucide-react";
+import { toast } from "sonner";
+import { getSchemaByName } from "@/lib/schema";
+import { extensionCategories, normalizePath } from "@/lib/utils/file";
 
 const EditComponent = forwardRef((props: any, ref) => {
   const { config } = useConfig();
   const { isPrivate } = useRepo();
 
   const { value, field, onChange } = props;
-  const mediaName = field.options?.media || config?.object.media[0].name;
+
+  const mediaConfig = useMemo(() => {
+    if (!config?.object?.media?.length) {
+      return undefined;
+    }
+    return field.options?.media !== false
+      ? field.options?.media
+        ? getSchemaByName(config.object, field.options.media, "media")
+        : config.object.media[0]
+      : undefined;
+  }, [field.options?.media, config?.object]);
+
+  const allowedExtensions = useMemo(() => {
+    if (!mediaConfig) return [];
+
+    let extensions = extensionCategories['image'];
+
+    const fieldExtensions = field.options?.extensions 
+      ? field.options.extensions
+      : field.options?.categories
+        ? field.options.categories.flatMap((category: string) => extensionCategories[category])
+        : [];
+
+    if (fieldExtensions.length) {
+      extensions = extensions.filter(ext => fieldExtensions.includes(ext));
+    }
+
+    if (mediaConfig.extensions) {
+      extensions = extensions.filter(ext => mediaConfig.extensions.includes(ext));
+    }
+
+    return extensions;
+  }, [field.options?.extensions, field.options?.categories, mediaConfig]);
+
+  const mediaName = mediaConfig?.name || config?.object.media[0].name;
   if (!mediaName) throw new Error("No media defined.");
 
   const mediaDialogRef = useRef<MediaDialogHandle>(null);
@@ -74,10 +111,26 @@ const EditComponent = forwardRef((props: any, ref) => {
 
   const [linkUrl, setLinkUrl] = useState("");
 
-  const openMediaDialog = config?.object.media?.input
+  const openMediaDialog = mediaConfig?.input
     ? () => { if (mediaDialogRef.current) mediaDialogRef.current.open() }
     : undefined;
 
+  const rootPath = useMemo(() => {
+    if (!field.options?.path) {
+      return mediaConfig?.input;
+    }
+
+    const normalizedPath = normalizePath(field.options.path);
+    const normalizedMediaPath = normalizePath(mediaConfig?.input);
+
+    if (!normalizedPath.startsWith(normalizedMediaPath)) {
+      console.warn(`"${field.options.path}" is not within media root "${mediaConfig?.input}". Defaulting to media root.`);
+      return mediaConfig?.input;
+    }
+
+    return normalizedPath;
+  }, [field.options?.path, mediaConfig?.input]);
+
   const editor = useEditor({
     immediatelyRender: true,
     extensions: [
@@ -119,8 +172,15 @@ const EditComponent = forwardRef((props: any, ref) => {
     onUpdate: ({ editor }) => onChange(editor.getHTML()),
     onCreate: async ({ editor }) => {
       if (config && value) {
-        const initialContent = await relativeToRawUrls(config.owner, config.repo, config.branch, mediaName, value, isPrivate);
-        editor.commands.setContent(initialContent || "<p></p>");
+        try {
+          const initialContent = await relativeToRawUrls(config.owner, config.repo, config.branch, mediaName, value, isPrivate);
+          editor.commands.setContent(initialContent || "<p></p>");
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+          console.warn(errorMessage);
+          toast.error(`${errorMessage} Check if the image exists or if media configuration is correct.`);
+          editor.commands.setContent(value);
+        }
       }
       setContentReady(true);
     }
@@ -129,12 +189,18 @@ const EditComponent = forwardRef((props: any, ref) => {
   const handleMediaDialogSubmit = useCallback(async (images: string[]) => {
     if (config && editor) {
       const content = await Promise.all(images.map(async (image) => {
-        const url = await getRawUrl(config.owner, config.repo, config.branch, mediaName, image, isPrivate);
-        return `<p><img src="${url}"></p>`;
+        try {
+          const url = await getRawUrl(config.owner, config.repo, config.branch, mediaName, image, isPrivate);
+          return `<p><img src="${url}"></p>`;
+        } catch {
+          toast.error(`Failed to load image: ${image}`);
+          // Return a placeholder with error styling
+          return `<p><img src="" alt="${image}" class="border border-destructive bg-destructive/10 rounded-md" /></p>`;
+        }
       }));
       editor.chain().focus().insertContent(content.join('\n')).run();
     }
-  }, [config, editor, isPrivate]);
+  }, [config, editor, isPrivate, mediaName]);
 
   const getBlockIcon = (editor: any) => {
     if (editor.isActive("heading", { level: 1 })) return <Heading1 className="h-4 w-4" />;
@@ -367,7 +433,14 @@ const EditComponent = forwardRef((props: any, ref) => {
           </div>
         </BubbleMenu>}
         <EditorContent editor={editor} />
-        <MediaDialog ref={mediaDialogRef} selected={[]} onSubmit={handleMediaDialogSubmit} />
+        <MediaDialog 
+          ref={mediaDialogRef} 
+          media={mediaConfig?.name}
+          initialPath={rootPath}
+          extensions={allowedExtensions}
+          selected={[]} 
+          onSubmit={handleMediaDialogSubmit} 
+        />
       </div>
     </>
   )
diff --git a/fields/core/rich-text/index.tsx b/fields/core/rich-text/index.tsx
index f1d44d2f..123d14e2 100644
--- a/fields/core/rich-text/index.tsx
+++ b/fields/core/rich-text/index.tsx
@@ -5,6 +5,7 @@ import { ViewComponent } from "./view-component";
 import { marked } from "marked";
 import TurndownService from "turndown";
 import { tables, strikethrough } from "joplin-turndown-plugin-gfm";
+import { getSchemaByName } from "@/lib/schema";
 
 const read = (value: any, field: Field, config: Record<string, any>) => {
   let html = field.options?.format === "html"
@@ -13,10 +14,15 @@ const read = (value: any, field: Field, config: Record<string, any>) => {
       ? marked(value)
       : value;
 
-  const prefixInput = field.options?.input ?? config.object.media?.input;
-  const prefixOutput = field.options?.output ?? config.object.media?.output;
+  const mediaConfig = field.options?.media === false
+    ? undefined
+    : field.options?.media && typeof field.options.media === 'string'
+      ? getSchemaByName(config.object, field.options.media, "media")
+      : config.object.media[0];
 
-  return htmlSwapPrefix(html, prefixOutput, prefixInput, true);
+  if (!mediaConfig) return html;
+
+  return htmlSwapPrefix(html, mediaConfig.output, mediaConfig.input, true);
 };
 
 const write = (value: any, field: Field, config: Record<string, any>) => {
@@ -24,10 +30,15 @@ const write = (value: any, field: Field, config: Record<string, any>) => {
 
   content = rawToRelativeUrls(config.owner, config.repo, config.branch, content);
 
-  const prefixInput = field.options?.input ?? config.object.media?.input;
-  const prefixOutput = field.options?.output ?? config.object.media?.output;
+  const mediaConfig = field.options?.media === false
+    ? undefined
+    : field.options?.media && typeof field.options.media === 'string'
+      ? getSchemaByName(config.object, field.options.media, "media")
+      : config.object.media[0];
 
-  content = htmlSwapPrefix(content, prefixInput, prefixOutput);
+  if (mediaConfig) {
+    content = htmlSwapPrefix(content, mediaConfig.input, mediaConfig.output);
+  }
 
   if (field.options?.format !== "html") {
     const turndownService = new TurndownService({

From bc8b8e65e78ebf4774174e65cb27a9871c64caf7 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 19 Mar 2025 17:00:20 +0800
Subject: [PATCH 55/95] Fixing scroll bug on media dialog

---
 components/media/media-view.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/media/media-view.tsx b/components/media/media-view.tsx
index 16a46d83..8594675f 100644
--- a/components/media/media-view.tsx
+++ b/components/media/media-view.tsx
@@ -287,9 +287,9 @@ const MediaView = ({
         </MediaUpload>
       </header>
       <MediaUpload media={mediaConfig.name} path={path} onUpload={handleUpload} extensions={filteredExtensions}>
-        <MediaUpload.DropZone className="flex-1">
+        <MediaUpload.DropZone className="flex-1 overflow-auto scrollbar">
           <div className="h-full relative flex flex-col">
-            <div className="flex-1 overflow-auto scrollbar" ref={filesGridRef}>
+            <div className="flex-1" ref={filesGridRef}>
               {isLoading
                 ? loadingSkeleton
                 : filteredData && filteredData.length > 0

From d2e05fef8d289e78296cbec67997900512792c08 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 19 Mar 2025 17:06:18 +0800
Subject: [PATCH 56/95] Cleaning up

---
 .../[repo]/[branch]/media/[name]/page.tsx     |   2 +-
 components/media/media-view.tsx               | 124 +++++++++---------
 2 files changed, 62 insertions(+), 64 deletions(-)

diff --git a/app/(main)/[owner]/[repo]/[branch]/media/[name]/page.tsx b/app/(main)/[owner]/[repo]/[branch]/media/[name]/page.tsx
index b1e606c4..a83240de 100644
--- a/app/(main)/[owner]/[repo]/[branch]/media/[name]/page.tsx
+++ b/app/(main)/[owner]/[repo]/[branch]/media/[name]/page.tsx
@@ -23,7 +23,7 @@ export default function Page({
         <h1 className="font-semibold text-lg md:text-2xl">Media</h1>
       </header>
       <div className="flex flex-col relative flex-1">
-        <MediaView initialPath={path} name={params.name} />
+        <MediaView initialPath={path} media={params.name} />
       </div>
     </div>
   );
diff --git a/components/media/media-view.tsx b/components/media/media-view.tsx
index 8594675f..47d4ce13 100644
--- a/components/media/media-view.tsx
+++ b/components/media/media-view.tsx
@@ -288,74 +288,72 @@ const MediaView = ({
       </header>
       <MediaUpload media={mediaConfig.name} path={path} onUpload={handleUpload} extensions={filteredExtensions}>
         <MediaUpload.DropZone className="flex-1 overflow-auto scrollbar">
-          <div className="h-full relative flex flex-col">
-            <div className="flex-1" ref={filesGridRef}>
-              {isLoading
-                ? loadingSkeleton
-                : filteredData && filteredData.length > 0
-                  ? <ul className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-8 p-1">
-                      {filteredData.map((item, index) => 
-                        <li key={item.path}>
-                          {item.type === "dir"
-                            ? <button
-                                className="hover:bg-muted focus:ring-offset-background focus:ring-2 focus:ring-ring focus:ring-offset-2 outline-none rounded-md block w-full"
-                                onClick={() => handleNavigate(item.path)}
-                              >
-                                <div className="flex items-center justify-center aspect-video">
-                                  <Folder className="stroke-[0.5] h-[5.5rem] w-[5.5rem]"/>
+          <div className="h-full relative flex flex-col" ref={filesGridRef}>
+            {isLoading
+              ? loadingSkeleton
+              : filteredData && filteredData.length > 0
+                ? <ul className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-8 p-1">
+                    {filteredData.map((item, index) => 
+                      <li key={item.path}>
+                        {item.type === "dir"
+                          ? <button
+                              className="hover:bg-muted focus:ring-offset-background focus:ring-2 focus:ring-ring focus:ring-offset-2 outline-none rounded-md block w-full"
+                              onClick={() => handleNavigate(item.path)}
+                            >
+                              <div className="flex items-center justify-center aspect-video">
+                                <Folder className="stroke-[0.5] h-[5.5rem] w-[5.5rem]"/>
+                              </div>
+                              <div className="flex items-center justify-center p-2">
+                                <div className="overflow-hidden h-9">
+                                  <div className="text-sm font-medium truncate">{item.name}</div>
                                 </div>
-                                <div className="flex items-center justify-center p-2">
-                                  <div className="overflow-hidden h-9">
+                              </div>
+                            </button>
+                          : <label htmlFor={`item-${index}`}>
+                              {onSelect &&
+                                <input 
+                                  type="checkbox" 
+                                  id={`item-${index}`} 
+                                  className="peer sr-only"
+                                  checked={selected.includes(item.path)}
+                                  onChange={() => handleSelect(item.path)}
+                                />
+                              }
+                              <div className={onSelect && "hover:bg-muted peer-focus:ring-offset-background peer-focus:ring-2 peer-focus:ring-ring peer-focus:ring-offset-2 rounded-md peer-checked:ring-offset-background peer-checked:ring-offset-2 peer-checked:ring-2 peer-checked:ring-ring relative"}>
+                                {extensionCategories.image.includes(item.extension)
+                                  ? <Thumbnail name={mediaConfig.name} path={item.path} className="rounded-t-md aspect-video"/>
+                                  : <div className="flex items-center justify-center rounded-md aspect-video">
+                                      <File className="stroke-[0.5] h-24 w-24"/>
+                                    </div>
+                                }
+                                <div className="flex gap-x-2 items-center p-2">
+                                  <div className="overflow-hidden mr-auto h-9">
                                     <div className="text-sm font-medium truncate">{item.name}</div>
+                                    <div className="text-xs text-muted-foreground truncate">{getFileSize(item.size)}</div>
                                   </div>
+                                  <FileOptions path={item.path} sha={item.sha} type="media" name={mediaConfig.name} onDelete={handleDelete} onRename={handleRename} portalProps={{container: filesGridRef.current}}>
+                                    <Button variant="ghost" size="icon" className="shrink-0">
+                                      <EllipsisVertical className="h-4 w-4" />
+                                    </Button>
+                                  </FileOptions>
                                 </div>
-                              </button>
-                            : <label htmlFor={`item-${index}`}>
-                                {onSelect &&
-                                  <input 
-                                    type="checkbox" 
-                                    id={`item-${index}`} 
-                                    className="peer sr-only"
-                                    checked={selected.includes(item.path)}
-                                    onChange={() => handleSelect(item.path)}
-                                  />
-                                }
-                                <div className={onSelect && "hover:bg-muted peer-focus:ring-offset-background peer-focus:ring-2 peer-focus:ring-ring peer-focus:ring-offset-2 rounded-md peer-checked:ring-offset-background peer-checked:ring-offset-2 peer-checked:ring-2 peer-checked:ring-ring relative"}>
-                                  {extensionCategories.image.includes(item.extension)
-                                    ? <Thumbnail name={mediaConfig.name} path={item.path} className="rounded-t-md aspect-video"/>
-                                    : <div className="flex items-center justify-center rounded-md aspect-video">
-                                        <File className="stroke-[0.5] h-24 w-24"/>
-                                      </div>
-                                  }
-                                  <div className="flex gap-x-2 items-center p-2">
-                                    <div className="overflow-hidden mr-auto h-9">
-                                      <div className="text-sm font-medium truncate">{item.name}</div>
-                                      <div className="text-xs text-muted-foreground truncate">{getFileSize(item.size)}</div>
-                                    </div>
-                                    <FileOptions path={item.path} sha={item.sha} type="media" name={mediaConfig.name} onDelete={handleDelete} onRename={handleRename} portalProps={{container: filesGridRef.current}}>
-                                      <Button variant="ghost" size="icon" className="shrink-0">
-                                        <EllipsisVertical className="h-4 w-4" />
-                                      </Button>
-                                    </FileOptions>
+                                {onSelect && selected.includes(item.path) &&
+                                  <div className="text-primary-foreground bg-primary p-0.5 rounded-full absolute top-2 left-2">
+                                    <Check className="stroke-[3] w-3 h-3"/>
                                   </div>
-                                  {onSelect && selected.includes(item.path) &&
-                                    <div className="text-primary-foreground bg-primary p-0.5 rounded-full absolute top-2 left-2">
-                                      <Check className="stroke-[3] w-3 h-3"/>
-                                    </div>
-                                  }
-                                </div>
-                              </label>
-                          }
-                          
-                        </li>
-                      )}
-                    </ul>
-                  : <p className="text-muted-foreground flex items-center justify-center text-sm p-6">
-                      <Ban className="h-4 w-4 mr-2"/>
-                      This folder is empty.
-                    </p>
-              }
-            </div>
+                                }
+                              </div>
+                            </label>
+                        }
+                        
+                      </li>
+                    )}
+                  </ul>
+                : <p className="text-muted-foreground flex items-center justify-center text-sm p-6">
+                    <Ban className="h-4 w-4 mr-2"/>
+                    This folder is empty.
+                  </p>
+            }
           </div>
         </MediaUpload.DropZone>
       </MediaUpload>

From a17d44e03b1a8e6520ad87cb5d63f86d11a7989a Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 19 Mar 2025 18:49:57 +0800
Subject: [PATCH 57/95] Cleaning up debug code

---
 fields/core/image/edit-component.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fields/core/image/edit-component.tsx b/fields/core/image/edit-component.tsx
index 04b280ba..d442c384 100644
--- a/fields/core/image/edit-component.tsx
+++ b/fields/core/image/edit-component.tsx
@@ -288,7 +288,7 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
                 </DndContext>
               </div>
             ) : (
-              <div className="aspect-square w-24 bg-red-600/50">
+              <div className="aspect-square w-24">
                 <ImageTeaser file={files[0].path} config={config} media={mediaConfig.name} onRemove={() => handleRemove(files[0].id)} />
               </div>
             )

From 77c4f0d475a1a398f3dc56091082df4585c3aecb Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 19 Mar 2025 18:58:57 +0800
Subject: [PATCH 58/95] Quick fix for single images

---
 fields/core/image/edit-component.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fields/core/image/edit-component.tsx b/fields/core/image/edit-component.tsx
index d442c384..a469042f 100644
--- a/fields/core/image/edit-component.tsx
+++ b/fields/core/image/edit-component.tsx
@@ -288,7 +288,8 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
                 </DndContext>
               </div>
             ) : (
-              <div className="aspect-square w-24">
+              <div className="aspect-square w-28 relative">
+                <Thumbnail name={mediaConfig.name} path={files[0].path} className="rounded-md w-28 h-28"/>
                 <ImageTeaser file={files[0].path} config={config} media={mediaConfig.name} onRemove={() => handleRemove(files[0].id)} />
               </div>
             )

From 84251652c2265317ff8c7f0c657b2e73d5f94787 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 19 Mar 2025 19:11:19 +0800
Subject: [PATCH 59/95] Fixing options

---
 fields/core/image/edit-component.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fields/core/image/edit-component.tsx b/fields/core/image/edit-component.tsx
index a469042f..8456ae7f 100644
--- a/fields/core/image/edit-component.tsx
+++ b/fields/core/image/edit-component.tsx
@@ -33,7 +33,7 @@ const ImageTeaser = ({ file, config, media, onRemove }: {
 }) => {
   return (
     <>
-      <div className="absolute bottom-1 right-1">
+      <div className="absolute bottom-1.5 right-1.5">
         <TooltipProvider>
           <Tooltip>
             <TooltipTrigger asChild>

From ff5e2a6ba6798d103fe2daef296884af3d484db0 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 19 Mar 2025 22:42:08 +0800
Subject: [PATCH 60/95] Fixing folders not showing up on collections

---
 app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
index 10f32767..9bd338e3 100644
--- a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
@@ -151,7 +151,7 @@ const parseContents = (
         fields: contentObject,
         type: "file",
       };
-    } else if (item.type === "tree" && !excludedFiles.includes(item.name)) {
+    } else if (item.type === "dir" && !excludedFiles.includes(item.name)) {
       return {
         name: item.name,
         path: item.path,

From a7ee57c8b80d696dcea48b557cacc35fd73ffc36 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 19 Mar 2025 22:46:42 +0800
Subject: [PATCH 61/95] Adding restriction on subfolders

---
 app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
index 9bd338e3..a8ed01f1 100644
--- a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
@@ -46,6 +46,10 @@ export async function GET(
     const normalizedPath = normalizePath(path);
     if (!normalizedPath.startsWith(schema.path)) throw new Error(`Invalid path "${path}" for collection "${params.name}".`);
 
+    if (schema.subfolders === false) {
+      if (normalizedPath !== schema.path) throw new Error(`Invalid path "${path}" for collection "${params.name}".`);
+    }
+
     let entries = await getCachedCollection(params.owner, params.repo, params.branch, normalizedPath, token);
     
     let data: {
@@ -151,7 +155,7 @@ const parseContents = (
         fields: contentObject,
         type: "file",
       };
-    } else if (item.type === "dir" && !excludedFiles.includes(item.name)) {
+    } else if (item.type === "dir" && !excludedFiles.includes(item.name) && schema.subfolders !== false) {
       return {
         name: item.name,
         path: item.path,

From 9c136126aca2f523767bc4d3a43168d86508ca6b Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Thu, 20 Mar 2025 08:56:25 +0800
Subject: [PATCH 62/95] Moving migrations to post build step

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9fa870bd..e6bafba6 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "next build && npm run db:migrate",
+    "build": "next build",
+    "postbuild": "npm run db:migrate",
     "start": "next start",
     "lint": "next lint",
     "db:generate": "npx drizzle-kit generate",

From d8cdd0dafb998d255f5fb8f0b8af50944a1fab28 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Thu, 20 Mar 2025 09:20:02 +0800
Subject: [PATCH 63/95] Debugging caching in development

---
 lib/githubCache.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index 9f6e608b..56802741 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -236,6 +236,8 @@ const getCachedCollection = async (
         )
       );
     }
+
+    console.log('Octokit call in getCachedCollection');
     
     // Fetch from GitHub to create the collection cache
     const octokit = createOctokitInstance(token);

From abed723bac85544a052a6d6a969080b972df34a9 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Thu, 20 Mar 2025 09:38:31 +0800
Subject: [PATCH 64/95] Removing debugging code

---
 lib/githubCache.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index 56802741..9f6e608b 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -236,8 +236,6 @@ const getCachedCollection = async (
         )
       );
     }
-
-    console.log('Octokit call in getCachedCollection');
     
     // Fetch from GitHub to create the collection cache
     const octokit = createOctokitInstance(token);

From 1d87730be3596d05e5a507566a108eb2224de72b Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Thu, 20 Mar 2025 13:44:38 +0800
Subject: [PATCH 65/95] Minor bug fixes

---
 components/collection/collection-table.tsx |  2 +-
 components/collection/collection-view.tsx  | 29 ++++++++++++++--------
 fields/core/reference/edit-component.tsx   |  2 +-
 fields/core/rich-text/edit-component.tsx   |  2 +-
 fields/core/select/edit-component.tsx      | 13 +++++++++-
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/components/collection/collection-table.tsx b/components/collection/collection-table.tsx
index 8cb19001..16886ed9 100644
--- a/components/collection/collection-table.tsx
+++ b/components/collection/collection-table.tsx
@@ -74,7 +74,7 @@ export function CollectionTable<TData extends TableData>({
                   <TableHead
                     key={header.id}
                     className={cn(
-                      "text-xs px-3 first:pl-0 last:pr-0 border-b hover:bg-muted/50 cursor-pointer select-none last:cursor-default last:hover:bg-background",
+                      "text-xs px-3 first:pl-0 last:pr-0 border-b hover:bg-muted/50 cursor-pointer select-none last:cursor-default last:hover:bg-background truncate",
                       header.column.columnDef.meta?.className
                     )}
                     onClick={header.column.getToggleSortingHandler()}
diff --git a/components/collection/collection-view.tsx b/components/collection/collection-view.tsx
index 932ff405..e2ecaa8c 100644
--- a/components/collection/collection-view.tsx
+++ b/components/collection/collection-view.tsx
@@ -78,16 +78,25 @@ export function CollectionView({
           type: "string"
         }
       });
-      if (schema.filename.startsWith("{year}-{month}-{day}")) {
-        pathAndFieldArray.push({
-          path: "date",
-          field: {
-            label: "Date",
-            name: "date",
-            type: "date"
-          }
-        });
-      }
+    }
+
+    // If the filename starts with {year}-{month}-{day} and date is listed in the
+    // view fields and is not an actual field, or if there are no fields, we add a date field
+    if (
+      schema.filename.startsWith("{year}-{month}-{day}")
+      && (
+        (schema.view?.fields.includes("date") && !pathAndFieldArray.find((item: any) => item.path === "date"))
+        || !schema.view?.fields
+      )
+    ) {
+      pathAndFieldArray.push({
+        path: "date",
+        field: {
+          label: "Date",
+          name: "date",
+          type: "date"
+        }
+      });
     }
 
     return pathAndFieldArray;
diff --git a/fields/core/reference/edit-component.tsx b/fields/core/reference/edit-component.tsx
index 579fd4a2..a23d9fa4 100644
--- a/fields/core/reference/edit-component.tsx
+++ b/fields/core/reference/edit-component.tsx
@@ -26,7 +26,7 @@ const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>)
       query: "{input}",
       fields: field.options?.search || "name"
     },
-    minlength: 2,
+    minlength: 0,
     results: "data.contents",
     value: field.options?.value || "{path}",
     label: field.options?.label || "{name}",
diff --git a/fields/core/rich-text/edit-component.tsx b/fields/core/rich-text/edit-component.tsx
index 8ad3bf53..e9095f14 100644
--- a/fields/core/rich-text/edit-component.tsx
+++ b/fields/core/rich-text/edit-component.tsx
@@ -132,7 +132,7 @@ const EditComponent = forwardRef((props: any, ref) => {
   }, [field.options?.path, mediaConfig?.input]);
 
   const editor = useEditor({
-    immediatelyRender: true,
+    immediatelyRender: false,
     extensions: [
       StarterKit.configure({
         dropcursor: { width: 2 }
diff --git a/fields/core/select/edit-component.tsx b/fields/core/select/edit-component.tsx
index 1279fb6f..9c453733 100644
--- a/fields/core/select/edit-component.tsx
+++ b/fields/core/select/edit-component.tsx
@@ -179,10 +179,20 @@ const EditComponent = forwardRef((props: any, ref: any) => {
       : Select;
 
   const fetchConfig = field.options?.fetch as FetchConfig;
+  
+  // Determine if we should load options immediately based on minlength
+  const shouldLoadInitially = fetchConfig?.minlength === undefined || fetchConfig?.minlength === 0;
+  
+  // Use field.options.default if defined, otherwise use our automatic behavior
+  const defaultOptions = field.options?.default !== undefined 
+    ? field.options.default 
+    : shouldLoadInitially;
+
   return (
     <SelectComponent
       ref={ref}
       isMulti={field.options?.multiple}
+      isClearable={true}
       classNamePrefix="react-select"
       placeholder={field.options?.placeholder || "Select..."}
       components={{ 
@@ -197,7 +207,8 @@ const EditComponent = forwardRef((props: any, ref: any) => {
       {...(fetchConfig
         ? {
             loadOptions,
-            cacheOptions: false,
+            cacheOptions: field.options?.cache ?? true,
+            defaultOptions: defaultOptions
           }
         : { options: staticOptions })}
     />

From 0f2156a6290896527192081dec8ecd7cef5f742b Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Thu, 20 Mar 2025 17:47:43 +0800
Subject: [PATCH 66/95] Cleaning up reference search

---
 .../[repo]/[branch]/collections/[name]/route.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
index a8ed01f1..21b3dc27 100644
--- a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
@@ -66,15 +66,26 @@ export async function GET(
       // If this is a search request, filter the contents
       if (type === "search" && query) {
         const searchQuery = query.toLowerCase();
+        const searchFields = Array.isArray(fields) ? fields : fields ? [fields] : [];
+        
         data.contents = data.contents.filter(item => {
-          return fields.some(field => {
-            // Handle extra fields (name and path)
+          if (searchFields.length === 0) {
+            if (
+              (item.name && item.name.toLowerCase().includes(searchQuery)) ||
+              (item.path && item.path.toLowerCase().includes(searchQuery))
+            ) {
+              return true;
+            }
+
+            return item.content && item.content.toLowerCase().includes(searchQuery);
+          }
+          
+          return searchFields.some(field => {
             if (field === 'name' || field === 'path') {
               const value = item[field];
               return value && String(value).toLowerCase().includes(searchQuery);
             }
             
-            // Handle content fields (e.g. fields.title)
             if (field.startsWith('fields.')) {
               const fieldPath = field.replace('fields.', '');
               const value = safeAccess(item.fields, fieldPath);

From 4fac2876762de68ec37b3a8b01c406c900ccd6d4 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Thu, 20 Mar 2025 18:58:38 +0800
Subject: [PATCH 67/95] Fixing options on text field (#202)

---
 fields/core/text/edit-component.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/fields/core/text/edit-component.tsx b/fields/core/text/edit-component.tsx
index d1bbc036..8f75d95c 100644
--- a/fields/core/text/edit-component.tsx
+++ b/fields/core/text/edit-component.tsx
@@ -4,9 +4,11 @@ import { forwardRef, useEffect, useImperativeHandle, useRef } from "react";
 import { Textarea } from "@/components/ui/textarea";
 
 const EditComponent = forwardRef((props: any, ref) => {
+  const { value, field, onChange } = props;
   const internalRef = useRef<HTMLTextAreaElement | null>(null);
 
   const adjustHeight = (el: HTMLTextAreaElement | null) => {
+    if (field.options?.autoresize === false) return;
     if (!el) return;
     el.style.height = "auto";
     const totalBorderWidth = 2;
@@ -23,7 +25,15 @@ const EditComponent = forwardRef((props: any, ref) => {
     adjustHeight(event.target);
   };
 
-  return <Textarea {...props} ref={internalRef} rows={props.rows ?? 6} onInput={handleInput} className="text-base" />;
+  return <Textarea
+    {...props}
+    ref={internalRef}
+    rows={field.options?.rows ?? 6}
+    minLength={field.options?.minlength}
+    maxLength={field.options?.maxlength}
+    onInput={handleInput}
+    className="text-base"
+  />;
 });
 
 export { EditComponent };
\ No newline at end of file

From ac3fcbd23582937e43b1d54baa4d017d94f32ea2 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 21 Mar 2025 07:52:18 +0800
Subject: [PATCH 68/95] Updating contributing guidelines

---
 CONTRIBUTING.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5c4fe106..6b6af6a4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,12 @@
 # Contributing to Pages CMS
 
 - Submit pull requests (PRs) against the `development` branch, not `main`.
+- For branches, we have:
+  - `main` is our production and default branch. This is what we deploy to https://app.pagescms.org.
+  - `development` is for staging. We deploy it at https://dev.pagescms.org.
+  - New features are worked in `feature/name-of-the-feature` branches.
+  - Issues are addressed in `issue/123-main-isse` branches.
+  - When ready, we PR against `development`, test it and then finally merge to `main`.
 - Keep changes focused: one feature or fix per PR.
 - Test locally before submitting.
 - Follow existing code style.

From 331182ff0327bdde616cda96d65fed85ca78c92f Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 21 Mar 2025 12:30:36 +0800
Subject: [PATCH 69/95] Moving history tracking to client

---
 app/(main)/[owner]/[repo]/[branch]/layout.tsx |   2 -
 app/api/tracker/route.ts                      |  95 ---
 components/repo/repo-latest.tsx               |  81 +--
 components/repo/repo-layout.tsx               |  13 +-
 components/tracker.tsx                        |  27 -
 db/migrations/0002_brainy_chamber.sql         |   1 +
 db/migrations/meta/0002_snapshot.json         | 625 ++++++++++++++++++
 db/migrations/meta/_journal.json              |   7 +
 db/schema.ts                                  |  12 -
 lib/tracker.ts                                |  59 ++
 10 files changed, 737 insertions(+), 185 deletions(-)
 delete mode 100644 app/api/tracker/route.ts
 delete mode 100644 components/tracker.tsx
 create mode 100644 db/migrations/0002_brainy_chamber.sql
 create mode 100644 db/migrations/meta/0002_snapshot.json
 create mode 100644 lib/tracker.ts

diff --git a/app/(main)/[owner]/[repo]/[branch]/layout.tsx b/app/(main)/[owner]/[repo]/[branch]/layout.tsx
index 8dfd3311..1e71ad2e 100644
--- a/app/(main)/[owner]/[repo]/[branch]/layout.tsx
+++ b/app/(main)/[owner]/[repo]/[branch]/layout.tsx
@@ -8,7 +8,6 @@ import { ConfigProvider } from "@/contexts/config-context";
 import { RepoLayout } from "@/components/repo/repo-layout";
 import { EmptyCreate } from "@/components/empty-create";
 import { Message } from "@/components/message";
-import { Tracker } from "@/components/tracker";
 
 export default async function Layout({
   children,
@@ -107,7 +106,6 @@ export default async function Layout({
 
   return (
     <ConfigProvider value={config}>
-      <Tracker owner={owner} repo={repo} branch={branch} />
       <RepoLayout>{errorMessage ? errorMessage : children}</RepoLayout>
     </ConfigProvider>
   );
diff --git a/app/api/tracker/route.ts b/app/api/tracker/route.ts
deleted file mode 100644
index a5056155..00000000
--- a/app/api/tracker/route.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { getAuth } from "@/lib/auth";
-import { and, desc, eq } from "drizzle-orm";
-import { db } from "@/db";
-import { historyTable } from "@/db/schema";
-import { z } from "zod";
-
-/**
- * Fetches and updates user's history of visits to repositories.
- * 
- * GET /api/tracker
- * POST /api/tracker
- * 
- * Requires authentication.
- */
-
-export async function GET(request: Request) {
-  try {
-    const { user, session } = await getAuth();
-    if (!session) return new Response(null, { status: 401 });
-
-    const latestVisit = await db.query.historyTable.findFirst({
-      where: eq(historyTable.userId, user.id),
-      orderBy: [desc(historyTable.lastVisited)]
-    });
-    
-    return Response.json({
-      status: "success",
-      data: latestVisit
-    });
-  } catch (error: any) {
-    console.error(error);
-    return Response.json({
-      status: "error",
-      message: error.message,
-    });
-  }
-}
-
-export async function POST(request: Request) {
-  try {
-    const { user, session } = await getAuth();
-    if (!session) return new Response(null, { status: 401 });
-
-    const data: any = await request.json();
-    
-    const validation = z.object({
-			owner: z.string().trim().min(1),
-			repo: z.string().trim().min(1),
-      branch: z.string().trim().min(1)
-		}).safeParse({
-			owner: data.owner,
-			repo: data.repo,
-      branch: data.branch
-		});
-		if (!validation.success) throw new Error ("Invalid parameters");
-
-    // We update the history table
-    const latestVisit = await db.query.historyTable.findFirst({
-      where: and(
-        eq(historyTable.owner, validation.data.owner),
-        eq(historyTable.repo, validation.data.repo),
-        eq(historyTable.userId, user.id)
-      )
-    });
-
-    if (latestVisit) {
-      await db.update(historyTable).set({
-        lastVisited: Math.floor(Date.now() / 1000),
-        branch: validation.data.branch
-      }).where(
-        and(
-          eq(historyTable.owner, validation.data.owner),
-          eq(historyTable.repo, validation.data.repo),
-          eq(historyTable.userId, user.id)
-        )
-      );
-    } else {
-      await db.insert(historyTable).values({
-        owner: validation.data.owner,
-        repo: validation.data.repo,
-        branch: validation.data.branch,
-        lastVisited: Math.floor(Date.now() / 1000),
-        userId: user.id
-      });
-    }
-
-    return Response.json(null, { status: 200 });
-  } catch (error: any) {
-    console.error(error);
-    return Response.json({
-      status: "error",
-      message: error.message,
-    });
-  }
-}
\ No newline at end of file
diff --git a/components/repo/repo-latest.tsx b/components/repo/repo-latest.tsx
index 0882ac55..ad35427c 100644
--- a/components/repo/repo-latest.tsx
+++ b/components/repo/repo-latest.tsx
@@ -3,64 +3,49 @@
 import { useState, useEffect } from "react";
 import { formatDistanceToNow } from "date-fns";
 import Link from "next/link";
-import { Button, buttonVariants } from "@/components/ui/button";
-import { Skeleton } from "@/components/ui/skeleton";
+import { buttonVariants } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 import { Ban } from "lucide-react";
+import { getVisits } from "@/lib/tracker";
   
 export function RepoLatest() {
-  const [latestVisit, setLatestVisit] = useState<any>(null);
-  const [isLoading, setIsLoading] = useState(true);
+  const [recentVisits, setRecentVisits] = useState<any[]>([]);
 
   useEffect(() => {
-    const fetchLatestVisit = async () => {
-      setIsLoading(true);
-      try {
-        const response = await fetch(`/api/tracker`);
-        if (!response.ok) throw new Error(`Failed to fetch latest visit: ${response.status} ${response.statusText}`);
-  
-        const data: any = await response.json();
-  
-        if (data.status !== "success") throw new Error(data.message);
-  
-        setLatestVisit(data.data);
-      } catch (error: any) {
-        console.error(error);
-      } finally {
-        setIsLoading(false);
-      }
+    // Only run in browser
+    if (typeof window !== 'undefined') {
+      const visits = getVisits();
+      setRecentVisits(visits);
     }
-
-    fetchLatestVisit();
   }, []);
 
-  if (isLoading) {
-    return (
-      <div className="flex gap-x-2 items-center border rounded-md px-3 py-2 text-sm">
-        <Skeleton className="h-6 w-6 rounded" />
-        <Skeleton className="h-5 w-24 text-left rounded" />
-        <Skeleton className="h-5 w-24 text-left rounded" />
-        <Button variant="outline" size="xs" className="ml-auto" disabled>
-          Open
-        </Button>
-      </div>
-    );
-  }
-
   return (
     <>
-      {latestVisit
-        ? <div className="flex gap-x-2 items-center border rounded-md px-3 py-2 text-sm">
-            <img src={`https://github.com/${latestVisit.owner}.png`} alt={latestVisit.owner} className="h-6 w-6 rounded" />
-            <div className="font-medium truncate">{latestVisit.repo}</div>
-            <div className="text-muted-foreground truncate">{formatDistanceToNow(new Date(latestVisit.lastVisited! * 1000))} ago</div>
-            <Link
-              className={cn("ml-auto", buttonVariants({ variant: "outline", size: "xs"}))}
-              href={`/${latestVisit.owner}/${latestVisit.repo}/${encodeURIComponent(latestVisit.branch)}`}
-            >
-              Open
-            </Link>
-          </div>
+      {recentVisits.length > 0
+        ? (
+          <ul>
+            {recentVisits.map((visit, index) => (
+              <li 
+                key={index} 
+                className={cn(
+                  "flex gap-x-2 items-center border border-b-0 last:border-b px-3 py-2 text-sm",
+                  index === 0 && "rounded-t-md",
+                  index === recentVisits.length - 1 && "rounded-b-md"
+                )}
+              >
+                <img src={`https://github.com/${visit.owner}.png`} alt={visit.owner} className="h-6 w-6 rounded" />
+                <div className="font-medium truncate">{visit.repo}</div>
+                <div className="text-muted-foreground truncate">{formatDistanceToNow(new Date(visit.timestamp * 1000))} ago</div>
+                <Link
+                  className={cn("ml-auto", buttonVariants({ variant: "outline", size: "xs"}))}
+                  href={`/${visit.owner}/${visit.repo}/${encodeURIComponent(visit.branch)}`}
+                >
+                  Open
+                </Link>
+              </li>
+            ))}
+          </ul>
+        )
         : <div className="text-sm text-muted-foreground h-[50px] px-6 flex justify-center items-center bg-accent rounded-md">
             <Ban className="h-4 w-4 mr-2"/>
             No recent visits.
@@ -68,4 +53,4 @@ export function RepoLatest() {
       }
     </>
   );
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/components/repo/repo-layout.tsx b/components/repo/repo-layout.tsx
index 5614d5dd..15fe63fd 100644
--- a/components/repo/repo-layout.tsx
+++ b/components/repo/repo-layout.tsx
@@ -2,9 +2,12 @@
 
 import { useEffect, useState } from "react";
 import { RepoSidebar } from "@/components/repo/repo-sidebar";
-import {Button } from "@/components/ui/button";
+import { Button } from "@/components/ui/button";
 import { Menu } from "lucide-react";
 import { cn } from "@/lib/utils";
+import { useConfig } from "@/contexts/config-context";
+import { useRepo } from "@/contexts/repo-context";
+import { trackVisit } from "@/lib/tracker";
 
 export function RepoLayout({
   children,
@@ -12,6 +15,8 @@ export function RepoLayout({
   children: React.ReactNode;
 }) {
   const [isMenuOpen, setMenuOpen] = useState(false);
+  const { config } = useConfig();
+  const { owner, repo } = useRepo();
 
   const handleMenuClose = () => setMenuOpen(false);
 
@@ -29,6 +34,12 @@ export function RepoLayout({
     return () => window.removeEventListener("keydown", handleKeyDown);
   }, [isMenuOpen]);
 
+  useEffect(() => {
+    if (config?.owner && config?.repo && config?.branch) {
+      trackVisit(owner, repo, config.branch);
+    }
+  }, [config]);
+
   return (
     <>
       <div className="flex h-screen w-full">
diff --git a/components/tracker.tsx b/components/tracker.tsx
deleted file mode 100644
index 915236a4..00000000
--- a/components/tracker.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-"use client";
-
-import { useEffect } from "react";
-
-export function Tracker({
-  owner,
-  repo,
-  branch
-}: {
-  owner: string,
-  repo: string,
-  branch: string
-}) {
-  useEffect(() => {
-    fetch("/api/tracker", {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        owner,
-        repo,
-        branch
-      }),
-    });
-  }, [owner, repo, branch]);
-
-  return null;
-}
\ No newline at end of file
diff --git a/db/migrations/0002_brainy_chamber.sql b/db/migrations/0002_brainy_chamber.sql
new file mode 100644
index 00000000..070370ce
--- /dev/null
+++ b/db/migrations/0002_brainy_chamber.sql
@@ -0,0 +1 @@
+DROP TABLE `history`;
\ No newline at end of file
diff --git a/db/migrations/meta/0002_snapshot.json b/db/migrations/meta/0002_snapshot.json
new file mode 100644
index 00000000..89c55386
--- /dev/null
+++ b/db/migrations/meta/0002_snapshot.json
@@ -0,0 +1,625 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "ee35a892-e370-4cb6-8bac-ce8fbce11d50",
+  "prevId": "9d186c64-ed0f-408e-ad44-a04dad063523",
+  "tables": {
+    "cache": {
+      "name": "cache",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "context": {
+          "name": "context",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'collection'"
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "parent_path": {
+          "name": "parent_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sha": {
+          "name": "sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "download_url": {
+          "name": "download_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "commit_sha": {
+          "name": "commit_sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "commit_timestamp": {
+          "name": "commit_timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_updated": {
+          "name": "last_updated",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_cache_owner_repo_branch_parentPath": {
+          "name": "idx_cache_owner_repo_branch_parentPath",
+          "columns": [
+            "owner",
+            "repo",
+            "branch",
+            "parent_path"
+          ],
+          "isUnique": false
+        },
+        "idx_cache_owner_repo_branch_path": {
+          "name": "idx_cache_owner_repo_branch_path",
+          "columns": [
+            "owner",
+            "repo",
+            "branch",
+            "path"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "collaborator": {
+      "name": "collaborator",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "installation_id": {
+          "name": "installation_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner_id": {
+          "name": "owner_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo_id": {
+          "name": "repo_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_collaborator_owner_repo_email": {
+          "name": "idx_collaborator_owner_repo_email",
+          "columns": [
+            "owner",
+            "repo",
+            "email"
+          ],
+          "isUnique": false
+        },
+        "idx_collaborator_userId": {
+          "name": "idx_collaborator_userId",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "collaborator_user_id_user_id_fk": {
+          "name": "collaborator_user_id_user_id_fk",
+          "tableFrom": "collaborator",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "collaborator_invited_by_user_id_fk": {
+          "name": "collaborator_invited_by_user_id_fk",
+          "tableFrom": "collaborator",
+          "tableTo": "user",
+          "columnsFrom": [
+            "invited_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "config": {
+      "name": "config",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sha": {
+          "name": "sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "object": {
+          "name": "object",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_config_owner_repo_branch": {
+          "name": "idx_config_owner_repo_branch",
+          "columns": [
+            "owner",
+            "repo",
+            "branch"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "email_login_token": {
+      "name": "email_login_token",
+      "columns": {
+        "token_hash": {
+          "name": "token_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "email_login_token_token_hash_unique": {
+          "name": "email_login_token_token_hash_unique",
+          "columns": [
+            "token_hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "github_installation_token": {
+      "name": "github_installation_token",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "ciphertext": {
+          "name": "ciphertext",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iv": {
+          "name": "iv",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "installation_id": {
+          "name": "installation_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_github_installation_token_installationId": {
+          "name": "idx_github_installation_token_installationId",
+          "columns": [
+            "installation_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "github_user_token": {
+      "name": "github_user_token",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "ciphertext": {
+          "name": "ciphertext",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iv": {
+          "name": "iv",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_github_user_token_userId": {
+          "name": "idx_github_user_token_userId",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "github_user_token_user_id_user_id_fk": {
+          "name": "github_user_token_user_id_user_id_fk",
+          "tableFrom": "github_user_token",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "session": {
+      "name": "session",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_session_userId": {
+          "name": "idx_session_userId",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_email": {
+          "name": "github_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_name": {
+          "name": "github_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_id": {
+          "name": "github_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_username": {
+          "name": "github_username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "user_github_id_unique": {
+          "name": "user_github_id_unique",
+          "columns": [
+            "github_id"
+          ],
+          "isUnique": true
+        },
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/db/migrations/meta/_journal.json b/db/migrations/meta/_journal.json
index f4884a86..c670e5b5 100644
--- a/db/migrations/meta/_journal.json
+++ b/db/migrations/meta/_journal.json
@@ -15,6 +15,13 @@
       "when": 1742264373167,
       "tag": "0001_late_shinko_yamashiro",
       "breakpoints": true
+    },
+    {
+      "idx": 2,
+      "version": "6",
+      "when": 1742531381179,
+      "tag": "0002_brainy_chamber",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/db/schema.ts b/db/schema.ts
index dbb9e72c..ac504d4d 100644
--- a/db/schema.ts
+++ b/db/schema.ts
@@ -23,17 +23,6 @@ const sessionTable = sqliteTable("session", {
   idx_session_userId: index("idx_session_userId").on(table.userId)
 }));
 
-const historyTable = sqliteTable("history", {
-  id: integer("id").primaryKey({ autoIncrement: true }),
-  owner: text("owner").notNull(),
-  repo: text("repo").notNull(),
-  branch: text("branch").notNull(),
-  lastVisited: integer("last_visited").notNull(),
-  userId: text("user_id").notNull().references(() => userTable.id)
-}, table => ({
-  idx_history_userId_lastVisited: index("idx_history_userId_lastVisited").on(table.userId, table.lastVisited)
-}));
-
 const githubUserTokenTable = sqliteTable("github_user_token", {
   id: integer("id").primaryKey({ autoIncrement: true }),
   ciphertext: text("ciphertext").notNull(),
@@ -114,7 +103,6 @@ const cacheTable = sqliteTable("cache", {
 export {
   userTable,
   sessionTable,
-  historyTable,
   githubUserTokenTable,
   githubInstallationTokenTable,
   emailLoginTokenTable,
diff --git a/lib/tracker.ts b/lib/tracker.ts
new file mode 100644
index 00000000..e0bd7577
--- /dev/null
+++ b/lib/tracker.ts
@@ -0,0 +1,59 @@
+type RepoVisit = {
+  owner: string;
+  repo: string;
+  branch: string;
+  timestamp: number;
+};
+
+const STORAGE_KEY = 'latestVisits';
+const MAX_VISITS = 5;
+
+const trackVisit = (owner: string, repo: string, branch: string): void => {
+  try {
+    const storedVisits = localStorage.getItem(STORAGE_KEY);
+    const visits: RepoVisit[] = storedVisits ? JSON.parse(storedVisits) : [];
+    
+    const existingIndex = visits.findIndex(v => 
+      v.owner.toLowerCase() === owner.toLowerCase() && 
+      v.repo.toLowerCase() === repo.toLowerCase());
+    
+    const currentTime = Math.floor(Date.now() / 1000);
+    
+    if (existingIndex >= 0) {
+      visits[existingIndex] = {
+        owner,
+        repo,
+        branch,
+        timestamp: currentTime
+      };
+    } else {
+      visits.push({
+        owner,
+        repo,
+        branch,
+        timestamp: currentTime
+      });
+    }
+    
+    const updatedVisits = visits
+      .sort((a, b) => b.timestamp - a.timestamp)
+      .slice(0, MAX_VISITS);
+    
+    localStorage.setItem(STORAGE_KEY, JSON.stringify(updatedVisits));
+  } catch (error) {
+    console.error('Failed to save recent visit to localStorage', error);
+  }
+}
+
+const getVisits = (): RepoVisit[] => {
+  try {
+    const storedVisits = localStorage.getItem(STORAGE_KEY);
+    const visits: RepoVisit[] = storedVisits ? JSON.parse(storedVisits) : [];
+    return visits;
+  } catch (error) {
+    console.error('Failed to load recent visits from localStorage', error);
+    return [];
+  }
+}
+
+export { trackVisit, getVisits }
\ No newline at end of file

From ab9a5b6bbec1cde84ee8f8b75d82d558b7a1a1ed Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 21 Mar 2025 19:30:35 +0800
Subject: [PATCH 70/95] Testing forced prefetch

---
 components/repo/repo-nav.tsx |  1 +
 lib/utils/octokit.ts         | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/components/repo/repo-nav.tsx b/components/repo/repo-nav.tsx
index 2e37257e..8162dddf 100644
--- a/components/repo/repo-nav.tsx
+++ b/components/repo/repo-nav.tsx
@@ -28,6 +28,7 @@ const RepoNavItem = ({
     )}
     href={href}
     onClick={onClick}
+    prefetch={true}
   >
     {icon}
     <span className="truncate">{children}</span>
diff --git a/lib/utils/octokit.ts b/lib/utils/octokit.ts
index fca87118..b50401f9 100644
--- a/lib/utils/octokit.ts
+++ b/lib/utils/octokit.ts
@@ -15,14 +15,22 @@ export const createOctokitInstance = (token: string) => {
       fetch: async (url: string, options: RequestInit) => {
         try {
           const response = await fetch(url, options);
+          
+          // Only attempt to log out on a 401 status
           if (response.status === 401) {
-            const data = await response.json();
-            if (data.message === "Bad credentials") {
-              // If the user revoke access, we sign them out
-              // TODO: fix that for layouts AND figure out how to catch error coming from data fetching in components
-              await handleSignOut();
+            try {
+              const data = await response.json();
+              if (data.message === "Bad credentials") {
+                // If the user revoked access, sign them out
+                await handleSignOut();
+              }
+            } catch (parseError) {
+              // If we can't parse the JSON, just continue
+              console.warn("Could not parse 401 response:", parseError);
             }
           }
+          
+          // Always return the original response regardless of status
           return response;
         } catch (error) {
           throw error;

From 59b4c832dcd211bc95f0518cfda2c060a5f4a985 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 21 Mar 2025 20:49:19 +0800
Subject: [PATCH 71/95] Adding ALT button on images in rich-text

---
 fields/core/rich-text/edit-component.tsx | 46 ++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/fields/core/rich-text/edit-component.tsx b/fields/core/rich-text/edit-component.tsx
index e9095f14..8cdd1b3a 100644
--- a/fields/core/rich-text/edit-component.tsx
+++ b/fields/core/rich-text/edit-component.tsx
@@ -110,6 +110,7 @@ const EditComponent = forwardRef((props: any, ref) => {
   const [isContentReady, setContentReady] = useState(false);
 
   const [linkUrl, setLinkUrl] = useState("");
+  const [imageAlt, setImageAlt] = useState("");
 
   const openMediaDialog = mediaConfig?.input
     ? () => { if (mediaDialogRef.current) mediaDialogRef.current.open() }
@@ -430,6 +431,51 @@ const EditComponent = forwardRef((props: any, ref) => {
                 </DropdownMenuContent>
               </DropdownMenu>
             }
+            {editor.isActive("image") &&
+              <Popover>
+                <PopoverTrigger asChild>
+                  <Button
+                    type="button"
+                    variant="ghost"
+                    size="icon-xxs"
+                    className="shrink-0 text-[0.6rem]"
+                    onClick={() => setImageAlt(editor.getAttributes('image').alt || "")}
+                  >
+                    ALT
+                  </Button>
+                </PopoverTrigger>
+                <PopoverContent className="p-1">
+                  <div className="flex gap-x-1 items-center">
+                    <Input
+                      className="h-8 flex-1"
+                      placeholder="Image description"
+                      value={imageAlt}
+                      onChange={e => setImageAlt(e.target.value)}
+                    />
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="xxs"
+                      className="shrink-0"
+                      onClick={() => {
+                        editor.chain().focus().updateAttributes('image', { alt: imageAlt }).run();
+                      }}
+                    >Set</Button>
+                    <Button
+                      type="button"
+                      variant="ghost"
+                      size="xxs"
+                      className="shrink-0"
+                      onClick={() => {
+                        editor.chain().focus().updateAttributes('image', { alt: "" }).run();
+                      }}
+                    >
+                      <Trash2 className="h-4 w-4" />
+                    </Button>
+                  </div>
+                </PopoverContent>
+              </Popover>
+            }
           </div>
         </BubbleMenu>}
         <EditorContent editor={editor} />

From ac9f5867439db03478cda02521893ff87bda62e2 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 21 Mar 2025 20:56:30 +0800
Subject: [PATCH 72/95] Bug with overloaded date

---
 components/collection/collection-view.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/collection/collection-view.tsx b/components/collection/collection-view.tsx
index e2ecaa8c..195f7ded 100644
--- a/components/collection/collection-view.tsx
+++ b/components/collection/collection-view.tsx
@@ -85,7 +85,7 @@ export function CollectionView({
     if (
       schema.filename.startsWith("{year}-{month}-{day}")
       && (
-        (schema.view?.fields.includes("date") && !pathAndFieldArray.find((item: any) => item.path === "date"))
+        (schema.view?.fields &&schema.view?.fields.includes("date") && !pathAndFieldArray.find((item: any) => item.path === "date"))
         || !schema.view?.fields
       )
     ) {

From a6f9d1b770f2197efe7ac34dfeaf8513b0686c2a Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 21 Mar 2025 21:59:40 +0800
Subject: [PATCH 73/95] Adding prefetch

---
 app/(main)/settings/page.tsx              | 2 +-
 components/collection/collection-view.tsx | 2 ++
 components/repo/repo-select.tsx           | 1 +
 components/repo/repo-sidebar.tsx          | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/(main)/settings/page.tsx b/app/(main)/settings/page.tsx
index b2f8b174..63937c0b 100644
--- a/app/(main)/settings/page.tsx
+++ b/app/(main)/settings/page.tsx
@@ -32,7 +32,7 @@ export default async function Page() {
   return (
     <MainRootLayout>
       <div className="max-w-screen-sm mx-auto p-4 md:p-6 space-y-6">
-        <Link className={cn(buttonVariants({ variant: "outline", size: "xs" }), "inline-flex")} href="/">
+        <Link className={cn(buttonVariants({ variant: "outline", size: "xs" }), "inline-flex")} href="/" prefetch={true}>
           <ArrowLeft className="h-4 w-4 mr-1.5" />
           Go home
         </Link>
diff --git a/components/collection/collection-view.tsx b/components/collection/collection-view.tsx
index 195f7ded..fbfb7b35 100644
--- a/components/collection/collection-view.tsx
+++ b/components/collection/collection-view.tsx
@@ -163,6 +163,7 @@ export function CollectionView({
               <Link
                 className="font-medium truncate"
                 href={`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collection/${encodeURIComponent(name)}/edit/${encodeURIComponent(row.original.path)}`}
+                prefetch={true}
               >
                 {CellView}
               </Link>
@@ -186,6 +187,7 @@ export function CollectionView({
           <Link
             className={cn(buttonVariants({ variant: "outline", size: "sm" }), "h-8")}
             href={`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/collection/${name}/edit/${encodeURIComponent(row.original.path)}`}
+            prefetch={true}
           >
             Edit
           </Link>
diff --git a/components/repo/repo-select.tsx b/components/repo/repo-select.tsx
index 53f30e66..2c1de9ff 100644
--- a/components/repo/repo-select.tsx
+++ b/components/repo/repo-select.tsx
@@ -163,6 +163,7 @@ export function RepoSelect({
                   <Link
                     className={cn("ml-auto", buttonVariants({ variant: "outline", size: "xs"}))}
                     href={`/${result.owner}/${result.repo}/${result.defaultBranch ? encodeURIComponent(result.defaultBranch) : ""}`}
+                    prefetch={true}
                   >
                     Open
                   </Link>
diff --git a/components/repo/repo-sidebar.tsx b/components/repo/repo-sidebar.tsx
index 35e3966b..9bf6ec3d 100644
--- a/components/repo/repo-sidebar.tsx
+++ b/components/repo/repo-sidebar.tsx
@@ -23,7 +23,7 @@ const RepoSidebar = ({
   return (
     <>
       <header className="border-b flex items-center px-3 py-2">
-        <Link className={buttonVariants({ variant: "ghost", size: "xs" })} href="/">
+        <Link className={buttonVariants({ variant: "ghost", size: "xs" })} href="/" prefetch={true}>
           <ArrowLeft className="h-4 w-4 mr-1.5" />
           All projects
         </Link>

From 6b83318fb53464ee2459b14188114154a49dc683 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Fri, 21 Mar 2025 22:09:13 +0800
Subject: [PATCH 74/95] Adding prefetch

---
 components/entry/entry-editor.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/entry/entry-editor.tsx b/components/entry/entry-editor.tsx
index c9016700..8f6b3028 100644
--- a/components/entry/entry-editor.tsx
+++ b/components/entry/entry-editor.tsx
@@ -224,6 +224,7 @@ export function EntryEditor({
             <Link
               className={cn(buttonVariants({ variant: "outline", size: "icon-xs" }), "mr-4 shrink-0")}
               href={navigateBack}
+              prefetch={true}
             >
               <ChevronLeft className="h-4 w-4"/>
             </Link>

From b92707f1a0dc59b0184419051bbe9332ed279cfa Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 22 Mar 2025 13:05:07 +0800
Subject: [PATCH 75/95] Added file AND permission cache tables, updated webhook
 rules for ALL use cases: app uninstall, repo transfer, renaming, etc

---
 .../[branch]/collections/[name]/route.ts      |   4 +-
 .../[branch]/media/[name]/[path]/route.ts     |   4 +-
 app/api/webhook/github/route.ts               | 154 +++-
 db/migrations/0001_late_shinko_yamashiro.sql  |  28 -
 db/migrations/0002_brainy_chamber.sql         |   1 -
 db/migrations/meta/0001_snapshot.json         | 699 ------------------
 db/migrations/meta/0002_snapshot.json         | 625 ----------------
 db/migrations/meta/_journal.json              |  14 -
 db/schema.ts                                  |  19 +-
 db/scripts/clear-cache.ts                     |  10 +-
 lib/githubCache.ts                            | 336 +++++----
 11 files changed, 342 insertions(+), 1552 deletions(-)
 delete mode 100644 db/migrations/0001_late_shinko_yamashiro.sql
 delete mode 100644 db/migrations/0002_brainy_chamber.sql
 delete mode 100644 db/migrations/meta/0001_snapshot.json
 delete mode 100644 db/migrations/meta/0002_snapshot.json

diff --git a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
index 21b3dc27..1456f57c 100644
--- a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
@@ -8,7 +8,7 @@ import { getConfig } from "@/lib/utils/config";
 import { normalizePath } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
-import { getCachedCollection } from "@/lib/githubCache";
+import { getCollectionCache } from "@/lib/githubCache";
 
 /**
  * Fetches and parses collection contents from GitHub repositories
@@ -50,7 +50,7 @@ export async function GET(
       if (normalizedPath !== schema.path) throw new Error(`Invalid path "${path}" for collection "${params.name}".`);
     }
 
-    let entries = await getCachedCollection(params.owner, params.repo, params.branch, normalizedPath, token);
+    let entries = await getCollectionCache(params.owner, params.repo, params.branch, normalizedPath, token);
     
     let data: {
       contents: Record<string, any>[],
diff --git a/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
index 3f6692bd..fa07342d 100644
--- a/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
@@ -3,7 +3,7 @@ import { getConfig } from "@/lib/utils/config";
 import { getFileExtension, normalizePath } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
-import { getCachedMediaFolder } from "@/lib/githubCache";
+import { getMediaCache } from "@/lib/githubCache";
 
 // Add docs
 
@@ -42,7 +42,7 @@ export async function GET(
     const { searchParams } = new URL(request.url);
     const nocache = searchParams.get('nocache');
 
-    let results = await getCachedMediaFolder(params.owner, params.repo, params.branch, normalizedPath, token, !!nocache);
+    let results = await getMediaCache(params.owner, params.repo, params.branch, normalizedPath, token, !!nocache);
 
     if (mediaConfig.extensions && mediaConfig.extensions.length > 0) {
       results = results.filter((item) => {
diff --git a/app/api/webhook/github/route.ts b/app/api/webhook/github/route.ts
index 00ec489c..f55ab499 100644
--- a/app/api/webhook/github/route.ts
+++ b/app/api/webhook/github/route.ts
@@ -4,14 +4,19 @@ import { db } from "@/db";
 import { collaboratorTable, githubInstallationTokenTable } from "@/db/schema";
 import { eq, inArray } from "drizzle-orm";
 import { normalizePath } from "@/lib/utils/file";
-import { updateMultipleFilesCache } from "@/lib/githubCache";
+import { 
+  updateMultipleFilesCache, 
+  clearFileCache,
+  updateFileCacheRepository,
+  updateFileCacheOwner
+} from "@/lib/githubCache";
 import { getInstallationToken } from "@/lib/token";
 
 /**
  * Handles GitHub webhooks:
  * - Maintains tables related to GitHub installations (e.g. collaborators,
  *   installation tokens)
- * - Maintains GitHub cache
+ * - Maintains GitHub cache (both files and permissions)
  * 
  * POST /api/webhook/github
  * 
@@ -32,54 +37,141 @@ export async function POST(request: Request) {
     const headersList = headers();
     const event = headersList.get("X-GitHub-Event");
 
-    // TODO: potentially disable collaborators rather than delete, so that they can be re-instated again (e.g. uninstall/reinstall app, transfer repo, etc)
     try {
       switch (event) {
         case "installation":
           if (data.action === "deleted") {
-            await db.delete(collaboratorTable).where(
-              eq(collaboratorTable.installationId, data.installation.id)
-            );
-            await db.delete(githubInstallationTokenTable).where(
-              eq(githubInstallationTokenTable.installationId, data.installation.id)
-            );
+            // App uninstalled
+            const accountLogin = data.account.login;
+            
+            await Promise.all([
+              db.delete(collaboratorTable).where(
+                eq(collaboratorTable.installationId, data.installation.id)
+              ),
+              db.delete(githubInstallationTokenTable).where(
+                eq(githubInstallationTokenTable.installationId, data.installation.id)
+              ),
+              clearFileCache(accountLogin)
+            ]);
           }
           break;
+          
         case "installation_repositories":
           if (data.action === "removed") {
+            // Repositories removed from installation
             const reposIdRemoved = data.repositories_removed.map((repo: any) => repo.id);
             if (reposIdRemoved.length === 0) break;
+            
             await db.delete(collaboratorTable).where(
               inArray(collaboratorTable.repoId, reposIdRemoved)
             );
+            
+            await Promise.all(
+              data.repositories_removed.map((repo: any) => 
+                clearFileCache(repo.owner.login, repo.name)
+              )
+            );
           }
           break;
+          
         case "repository":
-          if (data.action === "deleted" || data.action === "transferred") {
-            await db.delete(collaboratorTable).where(
-              eq(collaboratorTable.repoId, data.repository.id)
-            );
+          const owner = data.repository.owner.login;
+          const repoName = data.repository.name;
+          
+          if (data.action === "deleted") {
+            // Repository deleted
+            await Promise.all([
+              db.delete(collaboratorTable).where(
+                eq(collaboratorTable.repoId, data.repository.id)
+              ),
+              clearFileCache(owner, repoName)
+            ]);
+          } else if (data.action === "transferred") {
+            // Repository transferred
+            const oldOwner = data.changes?.owner?.from?.login || owner;
+            
+            await Promise.all([
+              db.delete(collaboratorTable).where(
+                eq(collaboratorTable.repoId, data.repository.id)
+              ),
+              clearFileCache(oldOwner, repoName)
+            ]);
           } else if (data.action === "renamed") {
-            await db.update(collaboratorTable).set({
-              repo: data.repository.name
-            }).where(
-              eq(collaboratorTable.repoId, data.repository.id)
-            );
+            // Repository renamed
+            const oldName = data.changes.repository.name.from;
+            const newName = data.repository.name;
+            
+            await Promise.all([
+              db.update(collaboratorTable).set({
+                repo: newName
+              }).where(
+                eq(collaboratorTable.repoId, data.repository.id)
+              ),
+              updateFileCacheRepository(owner, oldName, newName)
+            ]);
           }
           break;
+          
+        case "organization":
+          if (data.action === "renamed") {
+            // Organization renamed
+            const oldOwner = data.changes.login.from;
+            const newOwner = data.organization.login;
+            
+            await Promise.all([
+              db.update(collaboratorTable).set({
+                owner: newOwner
+              }).where(
+                eq(collaboratorTable.ownerId, data.organization.id)
+              ),
+              updateFileCacheOwner(oldOwner, newOwner)
+            ]);
+          } else if (data.action === "deleted") {
+            // Organization deleted
+            const orgName = data.organization.login;
+            
+            await Promise.all([
+              db.delete(collaboratorTable).where(
+                eq(collaboratorTable.ownerId, data.organization.id)
+              ),
+              clearFileCache(orgName)
+            ]);
+          }
+          break;
+          
         case "installation_target":
           if (data.action === "renamed") {
-            await db.update(collaboratorTable).set({
-              owner: data.account.login
-            }).where(
-              eq(collaboratorTable.ownerId, data.account.id)
-            );
+            // Account renamed
+            const oldOwner = data.changes.login.from;
+            const newOwner = data.account.login;
+            
+            await Promise.all([
+              db.update(collaboratorTable).set({
+                owner: newOwner
+              }).where(
+                eq(collaboratorTable.ownerId, data.account.id)
+              ),
+              updateFileCacheOwner(oldOwner, newOwner)
+            ]);
           }
           break;
+          
+        case "delete":
+          // Branch deleted
+          if (data.ref_type === "branch") {
+            const owner = data.repository.owner.login;
+            const repo = data.repository.name;
+            const branch = data.ref.replace('refs/heads/', '');
+            
+            await clearFileCache(owner, repo, branch);
+          }
+          break;
+          
         case "push":
-          const owner = data.repository.owner.login.toLowerCase();
-          const repo = data.repository.name.toLowerCase();
-          const branch = data.ref.replace('refs/heads/', '');
+          // Files changed (added, modified, removed)
+          const pushOwner = data.repository.owner.login;
+          const pushRepo = data.repository.name;
+          const pushBranch = data.ref.replace('refs/heads/', '');
           
           const removedFiles = data.commits.flatMap((commit: any) => 
             (commit.removed || []).map((path: string) => ({ 
@@ -101,7 +193,7 @@ export async function POST(request: Request) {
             }))
           );
 
-          const installationToken = await getInstallationToken(owner, repo);
+          const installationToken = await getInstallationToken(pushOwner, pushRepo);
 
           const commit = {
             sha: data.head_commit.id,
@@ -109,9 +201,9 @@ export async function POST(request: Request) {
           };
 
           await updateMultipleFilesCache(
-            owner,
-            repo,
-            branch,
+            pushOwner,
+            pushRepo,
+            pushBranch,
             removedFiles,
             modifiedFiles,
             addedFiles,
@@ -121,7 +213,7 @@ export async function POST(request: Request) {
           break;
       }
     } catch (error: any) {
-      // TODO: this may need to be logged for remediation since the DB must be accurate
+      // TODO: log for remediation (maybe invalidate cache to be safe)
       console.error("Error in Webhook", error);
     }
     
diff --git a/db/migrations/0001_late_shinko_yamashiro.sql b/db/migrations/0001_late_shinko_yamashiro.sql
deleted file mode 100644
index b9eee66a..00000000
--- a/db/migrations/0001_late_shinko_yamashiro.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-CREATE TABLE `cache` (
-	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`context` text DEFAULT 'collection' NOT NULL,
-	`owner` text NOT NULL,
-	`repo` text NOT NULL,
-	`branch` text NOT NULL,
-	`parent_path` text NOT NULL,
-	`name` text NOT NULL,
-	`path` text NOT NULL,
-	`type` text NOT NULL,
-	`content` text,
-	`sha` text,
-	`size` integer,
-	`download_url` text,
-	`commit_sha` text,
-	`commit_timestamp` integer,
-	`last_updated` integer NOT NULL
-);
---> statement-breakpoint
-CREATE INDEX `idx_cache_owner_repo_branch_parentPath` ON `cache` (`owner`,`repo`,`branch`,`parent_path`);--> statement-breakpoint
-CREATE UNIQUE INDEX `idx_cache_owner_repo_branch_path` ON `cache` (`owner`,`repo`,`branch`,`path`);--> statement-breakpoint
-CREATE INDEX `idx_collaborator_owner_repo_email` ON `collaborator` (`owner`,`repo`,`email`);--> statement-breakpoint
-CREATE INDEX `idx_collaborator_userId` ON `collaborator` (`user_id`);--> statement-breakpoint
-CREATE UNIQUE INDEX `idx_config_owner_repo_branch` ON `config` (`owner`,`repo`,`branch`);--> statement-breakpoint
-CREATE INDEX `idx_github_installation_token_installationId` ON `github_installation_token` (`installation_id`);--> statement-breakpoint
-CREATE UNIQUE INDEX `idx_github_user_token_userId` ON `github_user_token` (`user_id`);--> statement-breakpoint
-CREATE INDEX `idx_history_userId_lastVisited` ON `history` (`user_id`,`last_visited`);--> statement-breakpoint
-CREATE INDEX `idx_session_userId` ON `session` (`user_id`);
\ No newline at end of file
diff --git a/db/migrations/0002_brainy_chamber.sql b/db/migrations/0002_brainy_chamber.sql
deleted file mode 100644
index 070370ce..00000000
--- a/db/migrations/0002_brainy_chamber.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE `history`;
\ No newline at end of file
diff --git a/db/migrations/meta/0001_snapshot.json b/db/migrations/meta/0001_snapshot.json
deleted file mode 100644
index ac5d7739..00000000
--- a/db/migrations/meta/0001_snapshot.json
+++ /dev/null
@@ -1,699 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "9d186c64-ed0f-408e-ad44-a04dad063523",
-  "prevId": "9bebad23-d902-47ff-b6e6-8878fb0c5b3e",
-  "tables": {
-    "cache": {
-      "name": "cache",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "context": {
-          "name": "context",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'collection'"
-        },
-        "owner": {
-          "name": "owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo": {
-          "name": "repo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "parent_path": {
-          "name": "parent_path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "path": {
-          "name": "path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "content": {
-          "name": "content",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "sha": {
-          "name": "sha",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "size": {
-          "name": "size",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "download_url": {
-          "name": "download_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "commit_sha": {
-          "name": "commit_sha",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "commit_timestamp": {
-          "name": "commit_timestamp",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_updated": {
-          "name": "last_updated",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_cache_owner_repo_branch_parentPath": {
-          "name": "idx_cache_owner_repo_branch_parentPath",
-          "columns": [
-            "owner",
-            "repo",
-            "branch",
-            "parent_path"
-          ],
-          "isUnique": false
-        },
-        "idx_cache_owner_repo_branch_path": {
-          "name": "idx_cache_owner_repo_branch_path",
-          "columns": [
-            "owner",
-            "repo",
-            "branch",
-            "path"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "collaborator": {
-      "name": "collaborator",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "installation_id": {
-          "name": "installation_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "owner_id": {
-          "name": "owner_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo_id": {
-          "name": "repo_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "owner": {
-          "name": "owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo": {
-          "name": "repo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "invited_by": {
-          "name": "invited_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_collaborator_owner_repo_email": {
-          "name": "idx_collaborator_owner_repo_email",
-          "columns": [
-            "owner",
-            "repo",
-            "email"
-          ],
-          "isUnique": false
-        },
-        "idx_collaborator_userId": {
-          "name": "idx_collaborator_userId",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "collaborator_user_id_user_id_fk": {
-          "name": "collaborator_user_id_user_id_fk",
-          "tableFrom": "collaborator",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "collaborator_invited_by_user_id_fk": {
-          "name": "collaborator_invited_by_user_id_fk",
-          "tableFrom": "collaborator",
-          "tableTo": "user",
-          "columnsFrom": [
-            "invited_by"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "config": {
-      "name": "config",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "owner": {
-          "name": "owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo": {
-          "name": "repo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "sha": {
-          "name": "sha",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "object": {
-          "name": "object",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_config_owner_repo_branch": {
-          "name": "idx_config_owner_repo_branch",
-          "columns": [
-            "owner",
-            "repo",
-            "branch"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "email_login_token": {
-      "name": "email_login_token",
-      "columns": {
-        "token_hash": {
-          "name": "token_hash",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "email_login_token_token_hash_unique": {
-          "name": "email_login_token_token_hash_unique",
-          "columns": [
-            "token_hash"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "github_installation_token": {
-      "name": "github_installation_token",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "ciphertext": {
-          "name": "ciphertext",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iv": {
-          "name": "iv",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "installation_id": {
-          "name": "installation_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_github_installation_token_installationId": {
-          "name": "idx_github_installation_token_installationId",
-          "columns": [
-            "installation_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "github_user_token": {
-      "name": "github_user_token",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "ciphertext": {
-          "name": "ciphertext",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iv": {
-          "name": "iv",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_github_user_token_userId": {
-          "name": "idx_github_user_token_userId",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "github_user_token_user_id_user_id_fk": {
-          "name": "github_user_token_user_id_user_id_fk",
-          "tableFrom": "github_user_token",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "history": {
-      "name": "history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "owner": {
-          "name": "owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo": {
-          "name": "repo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "last_visited": {
-          "name": "last_visited",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_history_userId_lastVisited": {
-          "name": "idx_history_userId_lastVisited",
-          "columns": [
-            "user_id",
-            "last_visited"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "history_user_id_user_id_fk": {
-          "name": "history_user_id_user_id_fk",
-          "tableFrom": "history",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "session": {
-      "name": "session",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_session_userId": {
-          "name": "idx_session_userId",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "session_user_id_user_id_fk": {
-          "name": "session_user_id_user_id_fk",
-          "tableFrom": "session",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "user": {
-      "name": "user",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "github_email": {
-          "name": "github_email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "github_name": {
-          "name": "github_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "github_id": {
-          "name": "github_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "github_username": {
-          "name": "github_username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "user_github_id_unique": {
-          "name": "user_github_id_unique",
-          "columns": [
-            "github_id"
-          ],
-          "isUnique": true
-        },
-        "user_email_unique": {
-          "name": "user_email_unique",
-          "columns": [
-            "email"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    }
-  },
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
\ No newline at end of file
diff --git a/db/migrations/meta/0002_snapshot.json b/db/migrations/meta/0002_snapshot.json
deleted file mode 100644
index 89c55386..00000000
--- a/db/migrations/meta/0002_snapshot.json
+++ /dev/null
@@ -1,625 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "ee35a892-e370-4cb6-8bac-ce8fbce11d50",
-  "prevId": "9d186c64-ed0f-408e-ad44-a04dad063523",
-  "tables": {
-    "cache": {
-      "name": "cache",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "context": {
-          "name": "context",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'collection'"
-        },
-        "owner": {
-          "name": "owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo": {
-          "name": "repo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "parent_path": {
-          "name": "parent_path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "path": {
-          "name": "path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "content": {
-          "name": "content",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "sha": {
-          "name": "sha",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "size": {
-          "name": "size",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "download_url": {
-          "name": "download_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "commit_sha": {
-          "name": "commit_sha",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "commit_timestamp": {
-          "name": "commit_timestamp",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_updated": {
-          "name": "last_updated",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_cache_owner_repo_branch_parentPath": {
-          "name": "idx_cache_owner_repo_branch_parentPath",
-          "columns": [
-            "owner",
-            "repo",
-            "branch",
-            "parent_path"
-          ],
-          "isUnique": false
-        },
-        "idx_cache_owner_repo_branch_path": {
-          "name": "idx_cache_owner_repo_branch_path",
-          "columns": [
-            "owner",
-            "repo",
-            "branch",
-            "path"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "collaborator": {
-      "name": "collaborator",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "installation_id": {
-          "name": "installation_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "owner_id": {
-          "name": "owner_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo_id": {
-          "name": "repo_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "owner": {
-          "name": "owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo": {
-          "name": "repo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "invited_by": {
-          "name": "invited_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_collaborator_owner_repo_email": {
-          "name": "idx_collaborator_owner_repo_email",
-          "columns": [
-            "owner",
-            "repo",
-            "email"
-          ],
-          "isUnique": false
-        },
-        "idx_collaborator_userId": {
-          "name": "idx_collaborator_userId",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "collaborator_user_id_user_id_fk": {
-          "name": "collaborator_user_id_user_id_fk",
-          "tableFrom": "collaborator",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "collaborator_invited_by_user_id_fk": {
-          "name": "collaborator_invited_by_user_id_fk",
-          "tableFrom": "collaborator",
-          "tableTo": "user",
-          "columnsFrom": [
-            "invited_by"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "config": {
-      "name": "config",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "owner": {
-          "name": "owner",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "repo": {
-          "name": "repo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "branch": {
-          "name": "branch",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "sha": {
-          "name": "sha",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "version": {
-          "name": "version",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "object": {
-          "name": "object",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_config_owner_repo_branch": {
-          "name": "idx_config_owner_repo_branch",
-          "columns": [
-            "owner",
-            "repo",
-            "branch"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "email_login_token": {
-      "name": "email_login_token",
-      "columns": {
-        "token_hash": {
-          "name": "token_hash",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "email_login_token_token_hash_unique": {
-          "name": "email_login_token_token_hash_unique",
-          "columns": [
-            "token_hash"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "github_installation_token": {
-      "name": "github_installation_token",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "ciphertext": {
-          "name": "ciphertext",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iv": {
-          "name": "iv",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "installation_id": {
-          "name": "installation_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_github_installation_token_installationId": {
-          "name": "idx_github_installation_token_installationId",
-          "columns": [
-            "installation_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "github_user_token": {
-      "name": "github_user_token",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "ciphertext": {
-          "name": "ciphertext",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iv": {
-          "name": "iv",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_github_user_token_userId": {
-          "name": "idx_github_user_token_userId",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "github_user_token_user_id_user_id_fk": {
-          "name": "github_user_token_user_id_user_id_fk",
-          "tableFrom": "github_user_token",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "session": {
-      "name": "session",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idx_session_userId": {
-          "name": "idx_session_userId",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "session_user_id_user_id_fk": {
-          "name": "session_user_id_user_id_fk",
-          "tableFrom": "session",
-          "tableTo": "user",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "user": {
-      "name": "user",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "github_email": {
-          "name": "github_email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "github_name": {
-          "name": "github_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "github_id": {
-          "name": "github_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "github_username": {
-          "name": "github_username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "user_github_id_unique": {
-          "name": "user_github_id_unique",
-          "columns": [
-            "github_id"
-          ],
-          "isUnique": true
-        },
-        "user_email_unique": {
-          "name": "user_email_unique",
-          "columns": [
-            "email"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    }
-  },
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
\ No newline at end of file
diff --git a/db/migrations/meta/_journal.json b/db/migrations/meta/_journal.json
index c670e5b5..e63938b2 100644
--- a/db/migrations/meta/_journal.json
+++ b/db/migrations/meta/_journal.json
@@ -8,20 +8,6 @@
       "when": 1733392958887,
       "tag": "0000_lame_dormammu",
       "breakpoints": true
-    },
-    {
-      "idx": 1,
-      "version": "6",
-      "when": 1742264373167,
-      "tag": "0001_late_shinko_yamashiro",
-      "breakpoints": true
-    },
-    {
-      "idx": 2,
-      "version": "6",
-      "when": 1742531381179,
-      "tag": "0002_brainy_chamber",
-      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/db/schema.ts b/db/schema.ts
index ac504d4d..4bd17036 100644
--- a/db/schema.ts
+++ b/db/schema.ts
@@ -78,7 +78,7 @@ const configTable = sqliteTable("config", {
   idx_config_owner_repo_branch: uniqueIndex("idx_config_owner_repo_branch").on(table.owner, table.repo, table.branch)
 }));
 
-const cacheTable = sqliteTable("cache", {
+const cacheFileTable = sqliteTable("cache_file", {
   id: integer("id").primaryKey({ autoIncrement: true }),
   context: text("context").notNull().default('collection'),
   owner: text("owner").notNull(),
@@ -96,8 +96,18 @@ const cacheTable = sqliteTable("cache", {
   commitTimestamp: integer('commit_timestamp'),
   lastUpdated: integer("last_updated").notNull()
 }, table => ({
-  idx_cache_owner_repo_branch_parentPath: index("idx_cache_owner_repo_branch_parentPath").on(table.owner, table.repo, table.branch, table.parentPath),
-  idx_cache_owner_repo_branch_path: uniqueIndex("idx_cache_owner_repo_branch_path").on(table.owner, table.repo, table.branch, table.path)
+  idx_cache_file_owner_repo_branch_parentPath: index("idx_cache_file_owner_repo_branch_parentPath").on(table.owner, table.repo, table.branch, table.parentPath),
+  idx_cache_file_owner_repo_branch_path: uniqueIndex("idx_cache_file_owner_repo_branch_path").on(table.owner, table.repo, table.branch, table.path)
+}));
+
+const cachePermissionTable = sqliteTable("cache_permission", {
+  id: integer("id").primaryKey({ autoIncrement: true }),
+  githubId: integer("github_id").notNull(),
+  owner: text("owner").notNull(),
+  repo: text("repo").notNull(),
+  lastUpdated: integer("last_updated").notNull()
+}, table => ({
+  idx_cache_permission_githubId_owner_repo: index("idx_cache_permission_githubId_owner_repo").on(table.githubId, table.owner, table.repo)
 }));
 
 export {
@@ -108,5 +118,6 @@ export {
   emailLoginTokenTable,
   collaboratorTable,
   configTable,
-  cacheTable
+  cacheFileTable,
+  cachePermissionTable
 };
\ No newline at end of file
diff --git a/db/scripts/clear-cache.ts b/db/scripts/clear-cache.ts
index 27fe5e71..b1712a93 100644
--- a/db/scripts/clear-cache.ts
+++ b/db/scripts/clear-cache.ts
@@ -1,9 +1,13 @@
 import { db } from '../index';
-import { cacheTable } from '../schema';
+import { cacheFileTable, cachePermissionTable } from '../schema';
 
-db.delete(cacheTable)
+db.delete(cacheFileTable)
   .then(() => {
-    console.log('✅ Cache table cleared successfully');
+    console.log('✅ File cache cleared successfully');
+    return db.delete(cachePermissionTable);
+  })
+  .then(() => {
+    console.log('✅ Permission cache cleared successfully');
     process.exit(0);
   })
   .catch((error) => {
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index 9f6e608b..eef9bfee 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -4,7 +4,7 @@
 
 import { db } from "@/db";
 import { eq, and, inArray } from "drizzle-orm";
-import { cacheTable } from "@/db/schema";
+import { cacheFileTable } from "@/db/schema";
 import { createOctokitInstance } from "@/lib/utils/octokit";
 import path from "path";
 
@@ -29,7 +29,6 @@ type FileOperation = {
 
 type CacheContext = 'collection' | 'media';
 
-// TODO: add pagination for very large repos.
 // Bulk update cache entries (removed, modified and added files).
 const updateMultipleFilesCache = async (
   owner: string,
@@ -43,12 +42,12 @@ const updateMultipleFilesCache = async (
 ) => {
   // 1. Delete removed files in batch
   if (removedFiles.length > 0) {
-    await db.delete(cacheTable).where(
+    await db.delete(cacheFileTable).where(
       and(
-        eq(cacheTable.owner, owner),
-        eq(cacheTable.repo, repo),
-        eq(cacheTable.branch, branch),
-        inArray(cacheTable.path, removedFiles.map(f => f.path))
+        eq(cacheFileTable.owner, owner),
+        eq(cacheFileTable.repo, repo),
+        eq(cacheFileTable.branch, branch),
+        inArray(cacheFileTable.path, removedFiles.map(f => f.path))
       )
     );
   }
@@ -62,12 +61,12 @@ const updateMultipleFilesCache = async (
   if (parentPaths.length === 0) return;
 
   // 3. Query existing contexts (combined single query)
-  const existingEntries = await db.query.cacheTable.findMany({
+  const existingEntries = await db.query.cacheFileTable.findMany({
     where: and(
-      eq(cacheTable.owner, owner),
-      eq(cacheTable.repo, repo),
-      eq(cacheTable.branch, branch),
-      inArray(cacheTable.parentPath, parentPaths)
+      eq(cacheFileTable.owner, owner),
+      eq(cacheFileTable.repo, repo),
+      eq(cacheFileTable.branch, branch),
+      inArray(cacheFileTable.parentPath, parentPaths)
     )
   });
 
@@ -82,15 +81,15 @@ const updateMultipleFilesCache = async (
   }
 
   // 5. Query existing entries for modified/added files if commit provided
-  let existingFilesMap = new Map<string, typeof cacheTable.$inferSelect>();
+  let existingFilesMap = new Map<string, typeof cacheFileTable.$inferSelect>();
   if (commit) {
     const allPaths = [...modifiedFiles, ...addedFiles].map(f => f.path);
-    const existingFiles = await db.query.cacheTable.findMany({
+    const existingFiles = await db.query.cacheFileTable.findMany({
       where: and(
-        eq(cacheTable.owner, owner),
-        eq(cacheTable.repo, repo),
-        eq(cacheTable.branch, branch),
-        inArray(cacheTable.path, allPaths)
+        eq(cacheFileTable.owner, owner),
+        eq(cacheFileTable.repo, repo),
+        eq(cacheFileTable.branch, branch),
+        inArray(cacheFileTable.path, allPaths)
       )
     });
 
@@ -195,106 +194,16 @@ const updateMultipleFilesCache = async (
       };
 
       if (existingEntry) {
-        await db.update(cacheTable)
+        await db.update(cacheFileTable)
           .set(entryData)
-          .where(eq(cacheTable.id, existingEntry.id));
+          .where(eq(cacheFileTable.id, existingEntry.id));
       } else {
-        await db.insert(cacheTable).values(entryData);
+        await db.insert(cacheFileTable).values(entryData);
       }
     }
   }
 };
 
-// Attempt to get a collection from cache, if not found, fetch from GitHub.
-const getCachedCollection = async (
-  owner: string,
-  repo: string,
-  branch: string,
-  path: string,
-  token: string
-) => {
-  // Check the cache (no context as we may invalidate media cache)
-  let entries = await db.query.cacheTable.findMany({
-    where: and(
-      eq(cacheTable.owner, owner),
-      eq(cacheTable.repo, repo),
-      eq(cacheTable.branch, branch),
-      eq(cacheTable.parentPath, path)
-    )
-  });
-
-  if (entries.length === 0 || (entries.length > 0 && entries[0].context === 'media')) {
-    if (entries.length > 0 && entries[0].context === 'media') {
-      // Drop the media context cache and override it 
-      await db.delete(cacheTable).where(
-        and(
-        eq(cacheTable.owner, owner),
-        eq(cacheTable.repo, repo),
-        eq(cacheTable.branch, branch),
-        eq(cacheTable.parentPath, path),
-        eq(cacheTable.context, 'media')
-        )
-      );
-    }
-    
-    // Fetch from GitHub to create the collection cache
-    const octokit = createOctokitInstance(token);
-    const query = `
-      query ($owner: String!, $repo: String!, $expression: String!) {
-        repository(owner: $owner, name: $repo) {
-          object(expression: $expression) {
-            ... on Tree {
-              entries {
-                name
-                path
-                type
-                object {
-                  ... on Blob {
-                    text
-                    oid
-                    byteSize
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    `;
-    const expression = `${branch}:${path}`;
-    const response: any = await octokit.graphql(query, {
-      owner: owner,
-      repo: repo,
-      expression
-    });
-    
-    let githubEntries = response.repository?.object?.entries || [];
-
-    if (githubEntries.length > 0) {
-      // We populate the cache
-      entries = await db.insert(cacheTable)
-        .values(githubEntries.map((entry: any) => ({
-          context: 'collection',
-          owner,
-          repo,
-          branch,
-          parentPath: path,
-          name: entry.name,
-          path: entry.path,
-          type: entry.type === 'blob' ? 'file' : 'dir',
-          content: entry.type === "blob" ? entry.object.text : null,
-          sha: entry.type === "blob" ? entry.object.oid : null,
-          size: entry.type === "blob" ? entry.object.byteSize : null,
-          downloadUrl: null, // GraphQL doesn't return download URLs (and we don't need it for collections)
-          lastUpdated: Date.now()
-        })))
-        .returning();
-    }
-  }
-
-  return entries;
-}
-
 // Update the cache for an individual file (add, modify and delete).
 const updateFileCache = async (
   context: CacheContext,
@@ -308,12 +217,12 @@ const updateFileCache = async (
   switch (operation.type) {
     case 'delete':
       // We always remove entries from the cache when the file is deleted
-      await db.delete(cacheTable).where(
+      await db.delete(cacheFileTable).where(
         and(
-          eq(cacheTable.owner, owner),
-          eq(cacheTable.repo, repo),
-          eq(cacheTable.branch, branch),
-          eq(cacheTable.path, operation.path)
+          eq(cacheFileTable.owner, owner),
+          eq(cacheFileTable.repo, repo),
+          eq(cacheFileTable.branch, branch),
+          eq(cacheFileTable.path, operation.path)
         )
       );
       break;
@@ -326,7 +235,7 @@ const updateFileCache = async (
 
       if (operation.type === 'modify') {
         // We always update entries in the cache if they are already present
-        await db.update(cacheTable)
+        await db.update(cacheFileTable)
           .set({
             content: operation.content,
             sha: operation.sha,
@@ -340,29 +249,29 @@ const updateFileCache = async (
           })
           .where(
             and(
-              eq(cacheTable.context, context),
-              eq(cacheTable.owner, owner),
-              eq(cacheTable.repo, repo),
-              eq(cacheTable.branch, branch),
-              eq(cacheTable.path, operation.path)
+              eq(cacheFileTable.context, context),
+              eq(cacheFileTable.owner, owner),
+              eq(cacheFileTable.repo, repo),
+              eq(cacheFileTable.branch, branch),
+              eq(cacheFileTable.path, operation.path)
             )
           );
       } else {
         // We only cache collections and media folders. We only add files that already
         // have siblings in the cache. If not we can assume the collection or media
         // folder hasn't been cached yet, so we skip to avoid caching a single file.
-        const sibling = await db.query.cacheTable.findFirst({
+        const sibling = await db.query.cacheFileTable.findFirst({
           where: and(
-            eq(cacheTable.context, context),
-            eq(cacheTable.owner, owner),
-            eq(cacheTable.repo, repo),
-            eq(cacheTable.branch, branch),
-            eq(cacheTable.parentPath, parentPath)
+            eq(cacheFileTable.context, context),
+            eq(cacheFileTable.owner, owner),
+            eq(cacheFileTable.repo, repo),
+            eq(cacheFileTable.branch, branch),
+            eq(cacheFileTable.parentPath, parentPath)
           )
         });
 
         if (sibling) {
-          await db.insert(cacheTable)
+          await db.insert(cacheFileTable)
             .values({
               context,
               owner,
@@ -391,7 +300,7 @@ const updateFileCache = async (
         throw new Error('newPath is required for rename operations');
       }
       
-      await db.update(cacheTable)
+      await db.update(cacheFileTable)
         .set({
           path: operation.newPath,
           parentPath: path.dirname(operation.newPath),
@@ -405,19 +314,152 @@ const updateFileCache = async (
         })
         .where(
           and(
-            eq(cacheTable.owner, owner),
-            eq(cacheTable.repo, repo),
-            eq(cacheTable.branch, branch),
-            eq(cacheTable.path, operation.path)
+            eq(cacheFileTable.owner, owner),
+            eq(cacheFileTable.repo, repo),
+            eq(cacheFileTable.branch, branch),
+            eq(cacheFileTable.path, operation.path)
           )
         );
       break;
   }
 };
 
-// TODO: NO MEDIA NAME???
+// Update repository name in all cache entries
+const updateFileCacheRepository = async (
+  owner: string,
+  oldName: string,
+  newName: string
+) => {
+  await db.update(cacheFileTable)
+    .set({ repo: newName.toLowerCase() })
+    .where(
+      and(
+        eq(cacheFileTable.owner, owner.toLowerCase()),
+        eq(cacheFileTable.repo, oldName.toLowerCase())
+      )
+    );
+};
+
+// Update owner name in all cache entries
+const updateFileCacheOwner = async (
+  oldOwner: string,
+  newOwner: string
+) => {
+  await db.update(cacheFileTable)
+    .set({ owner: newOwner.toLowerCase() })
+    .where(
+      eq(cacheFileTable.owner, oldOwner.toLowerCase())
+    );
+};
+
+// Clear file cache entries
+const clearFileCache = async (
+  owner: string,
+  repo?: string,
+  branch?: string
+) => {
+  const conditions = [];
+  conditions.push(eq(cacheFileTable.owner, owner.toLowerCase()));  
+  if (repo) {
+    conditions.push(eq(cacheFileTable.repo, repo.toLowerCase()));
+    if (branch) conditions.push(eq(cacheFileTable.branch, branch));
+  }
+  
+  await db.delete(cacheFileTable).where(and(...conditions));
+};
+
+// Attempt to get a collection from cache, if not found, fetch from GitHub.
+const getCollectionCache = async (
+  owner: string,
+  repo: string,
+  branch: string,
+  path: string,
+  token: string
+) => {
+  // Check the cache (no context as we may invalidate media cache)
+  let entries = await db.query.cacheFileTable.findMany({
+    where: and(
+      eq(cacheFileTable.owner, owner),
+      eq(cacheFileTable.repo, repo),
+      eq(cacheFileTable.branch, branch),
+      eq(cacheFileTable.parentPath, path)
+    )
+  });
+
+  if (entries.length === 0 || (entries.length > 0 && entries[0].context === 'media')) {
+    if (entries.length > 0 && entries[0].context === 'media') {
+      // Drop the media context cache and override it 
+      await db.delete(cacheFileTable).where(
+        and(
+        eq(cacheFileTable.owner, owner),
+        eq(cacheFileTable.repo, repo),
+        eq(cacheFileTable.branch, branch),
+        eq(cacheFileTable.parentPath, path),
+        eq(cacheFileTable.context, 'media')
+        )
+      );
+    }
+    
+    // Fetch from GitHub to create the collection cache
+    const octokit = createOctokitInstance(token);
+    const query = `
+      query ($owner: String!, $repo: String!, $expression: String!) {
+        repository(owner: $owner, name: $repo) {
+          object(expression: $expression) {
+            ... on Tree {
+              entries {
+                name
+                path
+                type
+                object {
+                  ... on Blob {
+                    text
+                    oid
+                    byteSize
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    `;
+    const expression = `${branch}:${path}`;
+    const response: any = await octokit.graphql(query, {
+      owner: owner,
+      repo: repo,
+      expression
+    });
+    
+    let githubEntries = response.repository?.object?.entries || [];
+
+    if (githubEntries.length > 0) {
+      // We populate the cache
+      entries = await db.insert(cacheFileTable)
+        .values(githubEntries.map((entry: any) => ({
+          context: 'collection',
+          owner,
+          repo,
+          branch,
+          parentPath: path,
+          name: entry.name,
+          path: entry.path,
+          type: entry.type === 'blob' ? 'file' : 'dir',
+          content: entry.type === "blob" ? entry.object.text : null,
+          sha: entry.type === "blob" ? entry.object.oid : null,
+          size: entry.type === "blob" ? entry.object.byteSize : null,
+          downloadUrl: null, // GraphQL doesn't return download URLs (and we don't need it for collections)
+          lastUpdated: Date.now()
+        })))
+        .returning();
+    }
+  }
+
+  return entries;
+}
+
 // Attempt to get a media folder from cache, if not found, fetch from GitHub.
-const getCachedMediaFolder = async (
+const getMediaCache = async (
   owner: string,
   repo: string,
   branch: string,
@@ -429,12 +471,12 @@ const getCachedMediaFolder = async (
 
   if (!nocache) {
     // Check for entries from either context
-    entries = await db.query.cacheTable.findMany({
+    entries = await db.query.cacheFileTable.findMany({
       where: and(
-        eq(cacheTable.owner, owner),
-        eq(cacheTable.repo, repo),
-        eq(cacheTable.branch, branch),
-        eq(cacheTable.parentPath, path)
+        eq(cacheFileTable.owner, owner),
+        eq(cacheFileTable.repo, repo),
+        eq(cacheFileTable.branch, branch),
+        eq(cacheFileTable.parentPath, path)
       )
     });
   }
@@ -473,7 +515,7 @@ const getCachedMediaFolder = async (
 
     if (!nocache && githubEntries.length > 0) {
       // Cache the entries
-      entries = await db.insert(cacheTable)
+      entries = await db.insert(cacheFileTable)
         .values(mappedEntries)
         .returning();
     } else {
@@ -486,4 +528,12 @@ const getCachedMediaFolder = async (
   return entries;
 };
 
-export { updateMultipleFilesCache, getCachedCollection, updateFileCache, getCachedMediaFolder };
\ No newline at end of file
+export { 
+  updateMultipleFilesCache, 
+  updateFileCache,
+  updateFileCacheRepository,
+  updateFileCacheOwner,
+  clearFileCache,
+  getCollectionCache, 
+  getMediaCache
+};
\ No newline at end of file

From ea396e25d459ec19b7f58fc86e4dcb37facbd1a2 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 22 Mar 2025 13:47:56 +0800
Subject: [PATCH 76/95] Adding permission cache table

---
 db/migrations/0001_chilly_thena.sql   |  37 ++
 db/migrations/meta/0001_snapshot.json | 679 ++++++++++++++++++++++++++
 db/migrations/meta/_journal.json      |   7 +
 3 files changed, 723 insertions(+)
 create mode 100644 db/migrations/0001_chilly_thena.sql
 create mode 100644 db/migrations/meta/0001_snapshot.json

diff --git a/db/migrations/0001_chilly_thena.sql b/db/migrations/0001_chilly_thena.sql
new file mode 100644
index 00000000..ed6dcdd2
--- /dev/null
+++ b/db/migrations/0001_chilly_thena.sql
@@ -0,0 +1,37 @@
+CREATE TABLE `cache_file` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`context` text DEFAULT 'collection' NOT NULL,
+	`owner` text NOT NULL,
+	`repo` text NOT NULL,
+	`branch` text NOT NULL,
+	`parent_path` text NOT NULL,
+	`name` text NOT NULL,
+	`path` text NOT NULL,
+	`type` text NOT NULL,
+	`content` text,
+	`sha` text,
+	`size` integer,
+	`download_url` text,
+	`commit_sha` text,
+	`commit_timestamp` integer,
+	`last_updated` integer NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `cache_permission` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`github_id` integer NOT NULL,
+	`owner` text NOT NULL,
+	`repo` text NOT NULL,
+	`last_updated` integer NOT NULL
+);
+--> statement-breakpoint
+DROP TABLE `history`;--> statement-breakpoint
+CREATE INDEX `idx_cache_file_owner_repo_branch_parentPath` ON `cache_file` (`owner`,`repo`,`branch`,`parent_path`);--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_cache_file_owner_repo_branch_path` ON `cache_file` (`owner`,`repo`,`branch`,`path`);--> statement-breakpoint
+CREATE INDEX `idx_cache_permission_githubId_owner_repo` ON `cache_permission` (`github_id`,`owner`,`repo`);--> statement-breakpoint
+CREATE INDEX `idx_collaborator_owner_repo_email` ON `collaborator` (`owner`,`repo`,`email`);--> statement-breakpoint
+CREATE INDEX `idx_collaborator_userId` ON `collaborator` (`user_id`);--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_config_owner_repo_branch` ON `config` (`owner`,`repo`,`branch`);--> statement-breakpoint
+CREATE INDEX `idx_github_installation_token_installationId` ON `github_installation_token` (`installation_id`);--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_github_user_token_userId` ON `github_user_token` (`user_id`);--> statement-breakpoint
+CREATE INDEX `idx_session_userId` ON `session` (`user_id`);
\ No newline at end of file
diff --git a/db/migrations/meta/0001_snapshot.json b/db/migrations/meta/0001_snapshot.json
new file mode 100644
index 00000000..87426e8b
--- /dev/null
+++ b/db/migrations/meta/0001_snapshot.json
@@ -0,0 +1,679 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "bbee277a-4f56-4716-96ee-293b64cb5a33",
+  "prevId": "9bebad23-d902-47ff-b6e6-8878fb0c5b3e",
+  "tables": {
+    "cache_file": {
+      "name": "cache_file",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "context": {
+          "name": "context",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'collection'"
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "parent_path": {
+          "name": "parent_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sha": {
+          "name": "sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "download_url": {
+          "name": "download_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "commit_sha": {
+          "name": "commit_sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "commit_timestamp": {
+          "name": "commit_timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_updated": {
+          "name": "last_updated",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_cache_file_owner_repo_branch_parentPath": {
+          "name": "idx_cache_file_owner_repo_branch_parentPath",
+          "columns": [
+            "owner",
+            "repo",
+            "branch",
+            "parent_path"
+          ],
+          "isUnique": false
+        },
+        "idx_cache_file_owner_repo_branch_path": {
+          "name": "idx_cache_file_owner_repo_branch_path",
+          "columns": [
+            "owner",
+            "repo",
+            "branch",
+            "path"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "cache_permission": {
+      "name": "cache_permission",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "github_id": {
+          "name": "github_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_updated": {
+          "name": "last_updated",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_cache_permission_githubId_owner_repo": {
+          "name": "idx_cache_permission_githubId_owner_repo",
+          "columns": [
+            "github_id",
+            "owner",
+            "repo"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "collaborator": {
+      "name": "collaborator",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "installation_id": {
+          "name": "installation_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "owner_id": {
+          "name": "owner_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo_id": {
+          "name": "repo_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_collaborator_owner_repo_email": {
+          "name": "idx_collaborator_owner_repo_email",
+          "columns": [
+            "owner",
+            "repo",
+            "email"
+          ],
+          "isUnique": false
+        },
+        "idx_collaborator_userId": {
+          "name": "idx_collaborator_userId",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "collaborator_user_id_user_id_fk": {
+          "name": "collaborator_user_id_user_id_fk",
+          "tableFrom": "collaborator",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "collaborator_invited_by_user_id_fk": {
+          "name": "collaborator_invited_by_user_id_fk",
+          "tableFrom": "collaborator",
+          "tableTo": "user",
+          "columnsFrom": [
+            "invited_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "config": {
+      "name": "config",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "owner": {
+          "name": "owner",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "repo": {
+          "name": "repo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sha": {
+          "name": "sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "object": {
+          "name": "object",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_config_owner_repo_branch": {
+          "name": "idx_config_owner_repo_branch",
+          "columns": [
+            "owner",
+            "repo",
+            "branch"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "email_login_token": {
+      "name": "email_login_token",
+      "columns": {
+        "token_hash": {
+          "name": "token_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "email_login_token_token_hash_unique": {
+          "name": "email_login_token_token_hash_unique",
+          "columns": [
+            "token_hash"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "github_installation_token": {
+      "name": "github_installation_token",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "ciphertext": {
+          "name": "ciphertext",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iv": {
+          "name": "iv",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "installation_id": {
+          "name": "installation_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_github_installation_token_installationId": {
+          "name": "idx_github_installation_token_installationId",
+          "columns": [
+            "installation_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "github_user_token": {
+      "name": "github_user_token",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "ciphertext": {
+          "name": "ciphertext",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iv": {
+          "name": "iv",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_github_user_token_userId": {
+          "name": "idx_github_user_token_userId",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "github_user_token_user_id_user_id_fk": {
+          "name": "github_user_token_user_id_user_id_fk",
+          "tableFrom": "github_user_token",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "session": {
+      "name": "session",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_session_userId": {
+          "name": "idx_session_userId",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "github_email": {
+          "name": "github_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_name": {
+          "name": "github_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_id": {
+          "name": "github_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "github_username": {
+          "name": "github_username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "user_github_id_unique": {
+          "name": "user_github_id_unique",
+          "columns": [
+            "github_id"
+          ],
+          "isUnique": true
+        },
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/db/migrations/meta/_journal.json b/db/migrations/meta/_journal.json
index e63938b2..a3314d30 100644
--- a/db/migrations/meta/_journal.json
+++ b/db/migrations/meta/_journal.json
@@ -8,6 +8,13 @@
       "when": 1733392958887,
       "tag": "0000_lame_dormammu",
       "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1742620789383,
+      "tag": "0001_chilly_thena",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file

From 9a2a2ab717d4f7047929e165430b4f08dccae21d Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 22 Mar 2025 20:47:25 +0800
Subject: [PATCH 77/95] Adding cache access check with simple caching

---
 .env.local.example                            |  3 +-
 .../[branch]/collections/[name]/route.ts      |  7 ++-
 .../[branch]/media/[name]/[path]/route.ts     |  7 ++-
 ...thena.sql => 0001_certain_thunderbird.sql} |  2 +-
 db/migrations/meta/0001_snapshot.json         |  4 +-
 db/migrations/meta/_journal.json              |  4 +-
 db/schema.ts                                  |  2 +-
 lib/githubCache.ts                            | 62 ++++++++++++++++++-
 8 files changed, 79 insertions(+), 12 deletions(-)
 rename db/migrations/{0001_chilly_thena.sql => 0001_certain_thunderbird.sql} (92%)

diff --git a/.env.local.example b/.env.local.example
index d0f8b036..cee985a5 100644
--- a/.env.local.example
+++ b/.env.local.example
@@ -11,4 +11,5 @@ RESEND_DOMAIN_EMAIL ="your-domain-email"
 RESEND_API_KEY="your-resend-api-key"
 SQLITE_URL="file:./local.db"
 # SQLITE_AUTH_TOKEN=""
-# BASE_URL="https://mycustomdomain.com"
\ No newline at end of file
+# BASE_URL="https://mycustomdomain.com"
+# PERMISSION_CACHE_TTL="60"
\ No newline at end of file
diff --git a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
index 1456f57c..ef34fe9f 100644
--- a/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/collections/[name]/route.ts
@@ -8,7 +8,7 @@ import { getConfig } from "@/lib/utils/config";
 import { normalizePath } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
-import { getCollectionCache } from "@/lib/githubCache";
+import { getCollectionCache, checkRepoAccess } from "@/lib/githubCache";
 
 /**
  * Fetches and parses collection contents from GitHub repositories
@@ -31,6 +31,11 @@ export async function GET(
     const token = await getToken(user, params.owner, params.repo);
     if (!token) throw new Error("Token not found");
 
+    if (user.githubId) {
+      const hasAccess = await checkRepoAccess(token, params.owner, params.repo, user.githubId);
+      if (!hasAccess) throw new Error(`No access to repository ${params.owner}/${params.repo}.`);
+    }
+
     const config = await getConfig(params.owner, params.repo, params.branch);
     if (!config) throw new Error(`Configuration not found for ${params.owner}/${params.repo}/${params.branch}.`);
 
diff --git a/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
index fa07342d..fb061c56 100644
--- a/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
+++ b/app/api/[owner]/[repo]/[branch]/media/[name]/[path]/route.ts
@@ -3,7 +3,7 @@ import { getConfig } from "@/lib/utils/config";
 import { getFileExtension, normalizePath } from "@/lib/utils/file";
 import { getAuth } from "@/lib/auth";
 import { getToken } from "@/lib/token";
-import { getMediaCache } from "@/lib/githubCache";
+import { getMediaCache, checkRepoAccess } from "@/lib/githubCache";
 
 // Add docs
 
@@ -26,6 +26,11 @@ export async function GET(
     const token = await getToken(user, params.owner, params.repo);
     if (!token) throw new Error("Token not found");
 
+    if (user.githubId) {
+      const hasAccess = await checkRepoAccess(token, params.owner, params.repo, user.githubId);
+      if (!hasAccess) throw new Error(`No access to repository ${params.owner}/${params.repo}.`);
+    }
+
     const config = await getConfig(params.owner, params.repo, params.branch);
     if (!config) throw new Error(`Configuration not found for ${params.owner}/${params.repo}/${params.branch}.`);   
     
diff --git a/db/migrations/0001_chilly_thena.sql b/db/migrations/0001_certain_thunderbird.sql
similarity index 92%
rename from db/migrations/0001_chilly_thena.sql
rename to db/migrations/0001_certain_thunderbird.sql
index ed6dcdd2..bb76712d 100644
--- a/db/migrations/0001_chilly_thena.sql
+++ b/db/migrations/0001_certain_thunderbird.sql
@@ -28,7 +28,7 @@ CREATE TABLE `cache_permission` (
 DROP TABLE `history`;--> statement-breakpoint
 CREATE INDEX `idx_cache_file_owner_repo_branch_parentPath` ON `cache_file` (`owner`,`repo`,`branch`,`parent_path`);--> statement-breakpoint
 CREATE UNIQUE INDEX `idx_cache_file_owner_repo_branch_path` ON `cache_file` (`owner`,`repo`,`branch`,`path`);--> statement-breakpoint
-CREATE INDEX `idx_cache_permission_githubId_owner_repo` ON `cache_permission` (`github_id`,`owner`,`repo`);--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_cache_permission_githubId_owner_repo` ON `cache_permission` (`github_id`,`owner`,`repo`);--> statement-breakpoint
 CREATE INDEX `idx_collaborator_owner_repo_email` ON `collaborator` (`owner`,`repo`,`email`);--> statement-breakpoint
 CREATE INDEX `idx_collaborator_userId` ON `collaborator` (`user_id`);--> statement-breakpoint
 CREATE UNIQUE INDEX `idx_config_owner_repo_branch` ON `config` (`owner`,`repo`,`branch`);--> statement-breakpoint
diff --git a/db/migrations/meta/0001_snapshot.json b/db/migrations/meta/0001_snapshot.json
index 87426e8b..7e985c33 100644
--- a/db/migrations/meta/0001_snapshot.json
+++ b/db/migrations/meta/0001_snapshot.json
@@ -1,7 +1,7 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "bbee277a-4f56-4716-96ee-293b64cb5a33",
+  "id": "75bf6dd7-20d1-40ad-b47c-27709bf6784c",
   "prevId": "9bebad23-d902-47ff-b6e6-8878fb0c5b3e",
   "tables": {
     "cache_file": {
@@ -194,7 +194,7 @@
             "owner",
             "repo"
           ],
-          "isUnique": false
+          "isUnique": true
         }
       },
       "foreignKeys": {},
diff --git a/db/migrations/meta/_journal.json b/db/migrations/meta/_journal.json
index a3314d30..47bd2b73 100644
--- a/db/migrations/meta/_journal.json
+++ b/db/migrations/meta/_journal.json
@@ -12,8 +12,8 @@
     {
       "idx": 1,
       "version": "6",
-      "when": 1742620789383,
-      "tag": "0001_chilly_thena",
+      "when": 1742647191303,
+      "tag": "0001_certain_thunderbird",
       "breakpoints": true
     }
   ]
diff --git a/db/schema.ts b/db/schema.ts
index 4bd17036..f41ffacf 100644
--- a/db/schema.ts
+++ b/db/schema.ts
@@ -107,7 +107,7 @@ const cachePermissionTable = sqliteTable("cache_permission", {
   repo: text("repo").notNull(),
   lastUpdated: integer("last_updated").notNull()
 }, table => ({
-  idx_cache_permission_githubId_owner_repo: index("idx_cache_permission_githubId_owner_repo").on(table.githubId, table.owner, table.repo)
+  idx_cache_permission_githubId_owner_repo: uniqueIndex("idx_cache_permission_githubId_owner_repo").on(table.githubId, table.owner, table.repo)
 }));
 
 export {
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index eef9bfee..d4198e7f 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -3,8 +3,8 @@
  */
 
 import { db } from "@/db";
-import { eq, and, inArray } from "drizzle-orm";
-import { cacheFileTable } from "@/db/schema";
+import { eq, and, inArray, gt } from "drizzle-orm";
+import { cacheFileTable, cachePermissionTable } from "@/db/schema";
 import { createOctokitInstance } from "@/lib/utils/octokit";
 import path from "path";
 
@@ -528,6 +528,61 @@ const getMediaCache = async (
   return entries;
 };
 
+// Check if a user has access to a repository (with caching)
+const checkRepoAccess = async (
+  token: string,
+  owner: string,
+  repo: string,
+  githubId: number
+): Promise<boolean> => {
+  // Check if we have a cached result
+  const now = Date.now();
+  const ttl = parseInt(process.env.PERMISSION_CACHE_TTL || "60") * 60 * 1000;
+  
+  const cacheEntry = await db.query.cachePermissionTable.findFirst({
+    where: and(
+      eq(cachePermissionTable.githubId, githubId),
+      eq(cachePermissionTable.owner, owner.toLowerCase()),
+      eq(cachePermissionTable.repo, repo.toLowerCase()),
+      gt(cachePermissionTable.lastUpdated, now - ttl)
+    )
+  });
+  
+  if (cacheEntry) return true;
+  
+  // Not in cache, check with API
+  try {
+    console.log("Checking repo access for", owner, repo, githubId);
+    const octokit = createOctokitInstance(token);
+    const response = await octokit.rest.repos.get({ owner, repo });
+    console.log("Response", response.status === 200);
+    // If successful, cache the result
+    if (response.status === 200) {
+      console.log("Caching result");
+      await db.insert(cachePermissionTable)
+        .values({
+          githubId,
+          owner: owner.toLowerCase(),
+          repo: repo.toLowerCase(),
+          lastUpdated: Date.now()
+        })
+        .onConflictDoUpdate({
+          target: [
+            cachePermissionTable.githubId, 
+            cachePermissionTable.owner, 
+            cachePermissionTable.repo
+          ],
+          set: { lastUpdated: Date.now() }
+        });
+    }
+    
+    return response.status === 200;
+  } catch (error) {
+    console.error("Error checking repo access", error);
+    return false;
+  }
+};
+
 export { 
   updateMultipleFilesCache, 
   updateFileCache,
@@ -535,5 +590,6 @@ export {
   updateFileCacheOwner,
   clearFileCache,
   getCollectionCache, 
-  getMediaCache
+  getMediaCache,
+  checkRepoAccess
 };
\ No newline at end of file

From b1f80d4c988bec4b36b92b2cdac7932ba247f4bf Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 22 Mar 2025 20:50:58 +0800
Subject: [PATCH 78/95] Adding info in README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index db505ab4..df9901b1 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,7 @@ Variable | Comments
 `SQLITE_URL` | `file:./local.db` for development, `libsql://pages-cms-username.turso.io` for example if you use [Turso](https://turso.tech) (you should, Turso is great).
 `SQLITE_AUTH_TOKEN` | Leave blank for development, otherwise use the token provided by [Turso](https://turso.tech) (if that's what you use).
 `BASE_URL` | **OPTIONAL**. If you're deploying to Vercel or working locally, you won't need that. If you're deploying elsewhere, you'll need to specify the base URL for the app (e.g. `https://mycustomdomain.com`).
+| `PERMISSION_CACHE_TTL` | **OPTIONAL**. Time to live (in minutes) for the permission cache, which controls access to file cache. Defaults to 60. Set to 0 if you want to always check permissions against the GitHub API.
 
 ### Local development
 

From 6f6cd204b66cee5a5cf3785ffeff64ec6c344ce2 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 22 Mar 2025 21:44:10 +0800
Subject: [PATCH 79/95] Adding cache expiration for content

---
 README.md                       |  4 ++-
 app/api/webhook/github/route.ts | 27 -------------------
 lib/githubCache.ts              | 47 ++++++++++++++++++++++++++-------
 3 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index df9901b1..1813626c 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,9 @@ Variable | Comments
 `SQLITE_URL` | `file:./local.db` for development, `libsql://pages-cms-username.turso.io` for example if you use [Turso](https://turso.tech) (you should, Turso is great).
 `SQLITE_AUTH_TOKEN` | Leave blank for development, otherwise use the token provided by [Turso](https://turso.tech) (if that's what you use).
 `BASE_URL` | **OPTIONAL**. If you're deploying to Vercel or working locally, you won't need that. If you're deploying elsewhere, you'll need to specify the base URL for the app (e.g. `https://mycustomdomain.com`).
-| `PERMISSION_CACHE_TTL` | **OPTIONAL**. Time to live (in minutes) for the permission cache, which controls access to file cache. Defaults to 60. Set to 0 if you want to always check permissions against the GitHub API.
+`FILE_CACHE_TTL` | **OPTIONAL**. Time to live (in minutes) for file cache (collections and
+media folders). Defaults to 10080 (7 days). Set to "-1" to prevent the cache from ever expiring, or "0" if you want no cache.
+`PERMISSION_CACHE_TTL` | **OPTIONAL**. Time to live (in minutes) for the permission cache, which controls access to file cache. Defaults to 60. Set to "0" if you want to always check permissions against the GitHub API.
 
 ### Local development
 
diff --git a/app/api/webhook/github/route.ts b/app/api/webhook/github/route.ts
index f55ab499..ac6a41c1 100644
--- a/app/api/webhook/github/route.ts
+++ b/app/api/webhook/github/route.ts
@@ -112,33 +112,6 @@ export async function POST(request: Request) {
           }
           break;
           
-        case "organization":
-          if (data.action === "renamed") {
-            // Organization renamed
-            const oldOwner = data.changes.login.from;
-            const newOwner = data.organization.login;
-            
-            await Promise.all([
-              db.update(collaboratorTable).set({
-                owner: newOwner
-              }).where(
-                eq(collaboratorTable.ownerId, data.organization.id)
-              ),
-              updateFileCacheOwner(oldOwner, newOwner)
-            ]);
-          } else if (data.action === "deleted") {
-            // Organization deleted
-            const orgName = data.organization.login;
-            
-            await Promise.all([
-              db.delete(collaboratorTable).where(
-                eq(collaboratorTable.ownerId, data.organization.id)
-              ),
-              clearFileCache(orgName)
-            ]);
-          }
-          break;
-          
         case "installation_target":
           if (data.action === "renamed") {
             // Account renamed
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index d4198e7f..1dd6820f 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -386,16 +386,24 @@ const getCollectionCache = async (
     )
   });
 
-  if (entries.length === 0 || (entries.length > 0 && entries[0].context === 'media')) {
-    if (entries.length > 0 && entries[0].context === 'media') {
-      // Drop the media context cache and override it 
+  let cacheExpired = false;
+  // If set to "-1", the file cache doesn't expire
+  if (entries.length > 0 && process.env.FILE_CACHE_TTL !== "-1") {
+    const now = Date.now();
+    const ttl = parseInt(process.env.FILE_CACHE_TTL || "10080") * 60 * 1000; // Defaults to 7 days cache
+    cacheExpired = entries[0].lastUpdated < now - ttl;
+  }
+
+  if (entries.length === 0 || cacheExpired || (entries.length > 0 && entries[0].context === 'media')) {
+    if (cacheExpired || (entries.length > 0 && entries[0].context === 'media')) {
+      // Drop the cache, either because it expired or because we're replacing media
+      // cache with collection cache.
       await db.delete(cacheFileTable).where(
         and(
-        eq(cacheFileTable.owner, owner),
-        eq(cacheFileTable.repo, repo),
-        eq(cacheFileTable.branch, branch),
-        eq(cacheFileTable.parentPath, path),
-        eq(cacheFileTable.context, 'media')
+          eq(cacheFileTable.owner, owner),
+          eq(cacheFileTable.repo, repo),
+          eq(cacheFileTable.branch, branch),
+          eq(cacheFileTable.parentPath, path),
         )
       );
     }
@@ -480,8 +488,29 @@ const getMediaCache = async (
       )
     });
   }
+
+  let cacheExpired = false;
+  // If set to "-1", the file cache doesn't expire
+  if (entries.length > 0 && process.env.FILE_CACHE_TTL !== "-1") {
+    const now = Date.now();
+    const ttl = parseInt(process.env.FILE_CACHE_TTL || "10080") * 60 * 1000; // Defaults to 7 days cache
+    cacheExpired = entries[0].lastUpdated < now - ttl;
+  }
   
-  if (entries.length === 0) {  
+  if (entries.length === 0 || cacheExpired) {  
+    // Drop the cache as it expired
+    if (cacheExpired) {
+      // Drop expired cache
+      await db.delete(cacheFileTable).where(
+        and(
+          eq(cacheFileTable.owner, owner),
+          eq(cacheFileTable.repo, repo),
+          eq(cacheFileTable.branch, branch),
+          eq(cacheFileTable.parentPath, path),
+        )
+      );
+    }
+
     // No cache hit, fetch from GitHub
     const octokit = createOctokitInstance(token);
     const response = await octokit.rest.repos.getContent({

From 078d3601bb7b7147666d60ba295c6e5fb4aa1bec Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sat, 22 Mar 2025 22:38:04 +0800
Subject: [PATCH 80/95] Fixing bug with case sensitivity on owner/repo in
 webhook and cache

---
 lib/githubCache.ts | 60 +++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index 1dd6820f..6cde8e37 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -44,8 +44,8 @@ const updateMultipleFilesCache = async (
   if (removedFiles.length > 0) {
     await db.delete(cacheFileTable).where(
       and(
-        eq(cacheFileTable.owner, owner),
-        eq(cacheFileTable.repo, repo),
+        eq(cacheFileTable.owner, owner.toLowerCase()),
+        eq(cacheFileTable.repo, repo.toLowerCase()),
         eq(cacheFileTable.branch, branch),
         inArray(cacheFileTable.path, removedFiles.map(f => f.path))
       )
@@ -63,8 +63,8 @@ const updateMultipleFilesCache = async (
   // 3. Query existing contexts (combined single query)
   const existingEntries = await db.query.cacheFileTable.findMany({
     where: and(
-      eq(cacheFileTable.owner, owner),
-      eq(cacheFileTable.repo, repo),
+      eq(cacheFileTable.owner, owner.toLowerCase()),
+      eq(cacheFileTable.repo, repo.toLowerCase()),
       eq(cacheFileTable.branch, branch),
       inArray(cacheFileTable.parentPath, parentPaths)
     )
@@ -86,8 +86,8 @@ const updateMultipleFilesCache = async (
     const allPaths = [...modifiedFiles, ...addedFiles].map(f => f.path);
     const existingFiles = await db.query.cacheFileTable.findMany({
       where: and(
-        eq(cacheFileTable.owner, owner),
-        eq(cacheFileTable.repo, repo),
+        eq(cacheFileTable.owner, owner.toLowerCase()),
+        eq(cacheFileTable.repo, repo.toLowerCase()),
         eq(cacheFileTable.branch, branch),
         inArray(cacheFileTable.path, allPaths)
       )
@@ -177,8 +177,8 @@ const updateMultipleFilesCache = async (
 
       const entryData = {
         context,
-        owner,
-        repo,
+        owner: owner.toLowerCase(),
+        repo: repo.toLowerCase(),
         branch,
         path: file.path,
         parentPath,
@@ -219,8 +219,8 @@ const updateFileCache = async (
       // We always remove entries from the cache when the file is deleted
       await db.delete(cacheFileTable).where(
         and(
-          eq(cacheFileTable.owner, owner),
-          eq(cacheFileTable.repo, repo),
+          eq(cacheFileTable.owner, owner.toLowerCase()),
+          eq(cacheFileTable.repo, repo.toLowerCase()),
           eq(cacheFileTable.branch, branch),
           eq(cacheFileTable.path, operation.path)
         )
@@ -250,8 +250,8 @@ const updateFileCache = async (
           .where(
             and(
               eq(cacheFileTable.context, context),
-              eq(cacheFileTable.owner, owner),
-              eq(cacheFileTable.repo, repo),
+              eq(cacheFileTable.owner, owner.toLowerCase()),
+              eq(cacheFileTable.repo, repo.toLowerCase()),
               eq(cacheFileTable.branch, branch),
               eq(cacheFileTable.path, operation.path)
             )
@@ -263,8 +263,8 @@ const updateFileCache = async (
         const sibling = await db.query.cacheFileTable.findFirst({
           where: and(
             eq(cacheFileTable.context, context),
-            eq(cacheFileTable.owner, owner),
-            eq(cacheFileTable.repo, repo),
+            eq(cacheFileTable.owner, owner.toLowerCase()),
+            eq(cacheFileTable.repo, repo.toLowerCase()),
             eq(cacheFileTable.branch, branch),
             eq(cacheFileTable.parentPath, parentPath)
           )
@@ -274,8 +274,8 @@ const updateFileCache = async (
           await db.insert(cacheFileTable)
             .values({
               context,
-              owner,
-              repo,
+              owner: owner.toLowerCase(),
+              repo: repo.toLowerCase(),
               branch,
               path: operation.path,
               parentPath,
@@ -314,8 +314,8 @@ const updateFileCache = async (
         })
         .where(
           and(
-            eq(cacheFileTable.owner, owner),
-            eq(cacheFileTable.repo, repo),
+            eq(cacheFileTable.owner, owner.toLowerCase()),
+            eq(cacheFileTable.repo, repo.toLowerCase()),
             eq(cacheFileTable.branch, branch),
             eq(cacheFileTable.path, operation.path)
           )
@@ -379,8 +379,8 @@ const getCollectionCache = async (
   // Check the cache (no context as we may invalidate media cache)
   let entries = await db.query.cacheFileTable.findMany({
     where: and(
-      eq(cacheFileTable.owner, owner),
-      eq(cacheFileTable.repo, repo),
+      eq(cacheFileTable.owner, owner.toLowerCase()),
+      eq(cacheFileTable.repo, repo.toLowerCase()),
       eq(cacheFileTable.branch, branch),
       eq(cacheFileTable.parentPath, path)
     )
@@ -400,8 +400,8 @@ const getCollectionCache = async (
       // cache with collection cache.
       await db.delete(cacheFileTable).where(
         and(
-          eq(cacheFileTable.owner, owner),
-          eq(cacheFileTable.repo, repo),
+          eq(cacheFileTable.owner, owner.toLowerCase()),
+          eq(cacheFileTable.repo, repo.toLowerCase()),
           eq(cacheFileTable.branch, branch),
           eq(cacheFileTable.parentPath, path),
         )
@@ -446,8 +446,8 @@ const getCollectionCache = async (
       entries = await db.insert(cacheFileTable)
         .values(githubEntries.map((entry: any) => ({
           context: 'collection',
-          owner,
-          repo,
+          owner: owner.toLowerCase(),
+          repo: repo.toLowerCase(),
           branch,
           parentPath: path,
           name: entry.name,
@@ -481,8 +481,8 @@ const getMediaCache = async (
     // Check for entries from either context
     entries = await db.query.cacheFileTable.findMany({
       where: and(
-        eq(cacheFileTable.owner, owner),
-        eq(cacheFileTable.repo, repo),
+        eq(cacheFileTable.owner, owner.toLowerCase()),
+        eq(cacheFileTable.repo, repo.toLowerCase()),
         eq(cacheFileTable.branch, branch),
         eq(cacheFileTable.parentPath, path)
       )
@@ -503,8 +503,8 @@ const getMediaCache = async (
       // Drop expired cache
       await db.delete(cacheFileTable).where(
         and(
-          eq(cacheFileTable.owner, owner),
-          eq(cacheFileTable.repo, repo),
+          eq(cacheFileTable.owner, owner.toLowerCase()),
+          eq(cacheFileTable.repo, repo.toLowerCase()),
           eq(cacheFileTable.branch, branch),
           eq(cacheFileTable.parentPath, path),
         )
@@ -526,8 +526,8 @@ const getMediaCache = async (
     
     const mappedEntries = githubEntries.map(entry => ({
       context: 'media' as CacheContext,
-      owner,
-      repo,
+      owner: owner.toLowerCase(),
+      repo: repo.toLowerCase(),
       branch,
       parentPath: path,
       name: entry.name,

From 1275162f0aa7abb4c354316407b7e3102d182c7a Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 26 Mar 2025 11:57:27 +0800
Subject: [PATCH 81/95] hotfix: add detailed error logging for webhook handler

---
 app/api/webhook/github/route.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/api/webhook/github/route.ts b/app/api/webhook/github/route.ts
index ac6a41c1..13fa7fc6 100644
--- a/app/api/webhook/github/route.ts
+++ b/app/api/webhook/github/route.ts
@@ -187,7 +187,12 @@ export async function POST(request: Request) {
       }
     } catch (error: any) {
       // TODO: log for remediation (maybe invalidate cache to be safe)
-      console.error("Error in Webhook", error);
+      console.error("Error in Webhook", {
+        error,
+        event,
+        payload: data,
+        action: data?.action
+      });
     }
     
     return Response.json(null, { status: 200 });

From eb7df94355f9d5398b51c0b041a5e6e5826bc6f3 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 26 Mar 2025 12:25:30 +0800
Subject: [PATCH 82/95] hotfix: webhook errors

---
 app/api/webhook/github/route.ts | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/api/webhook/github/route.ts b/app/api/webhook/github/route.ts
index 13fa7fc6..9d872f0f 100644
--- a/app/api/webhook/github/route.ts
+++ b/app/api/webhook/github/route.ts
@@ -42,7 +42,12 @@ export async function POST(request: Request) {
         case "installation":
           if (data.action === "deleted") {
             // App uninstalled
-            const accountLogin = data.account.login;
+            const accountLogin = data.installation?.account?.login;
+            
+            if (!accountLogin) {
+              console.error("Missing account login in installation deleted event", data.installation);
+              break;
+            }
             
             await Promise.all([
               db.delete(collaboratorTable).where(
@@ -59,7 +64,7 @@ export async function POST(request: Request) {
         case "installation_repositories":
           if (data.action === "removed") {
             // Repositories removed from installation
-            const reposIdRemoved = data.repositories_removed.map((repo: any) => repo.id);
+            const reposIdRemoved = data.repositories_removed?.map((repo: any) => repo.id) || [];
             if (reposIdRemoved.length === 0) break;
             
             await db.delete(collaboratorTable).where(
@@ -67,9 +72,14 @@ export async function POST(request: Request) {
             );
             
             await Promise.all(
-              data.repositories_removed.map((repo: any) => 
-                clearFileCache(repo.owner.login, repo.name)
-              )
+              (data.repositories_removed || []).map((repo: any) => {
+                // full_name format is "owner/repo"
+                const [owner, repoName] = (repo.full_name || "").split('/');
+                if (owner && repoName) {
+                  return clearFileCache(owner, repoName);
+                }
+                return Promise.resolve();
+              })
             );
           }
           break;
@@ -142,6 +152,12 @@ export async function POST(request: Request) {
           
         case "push":
           // Files changed (added, modified, removed)
+          // Skip cache updates for branch deletions (they're handled by the "delete" event)
+          if (data.deleted === true) {
+            console.log("Skipping push event for branch deletion");
+            break;
+          }
+
           const pushOwner = data.repository.owner.login;
           const pushRepo = data.repository.name;
           const pushBranch = data.ref.replace('refs/heads/', '');

From ff58c6c1fe5c32761080d5ab76cab40375b87376 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 26 Mar 2025 12:48:50 +0800
Subject: [PATCH 83/95] hotfix: webhook errors

---
 app/api/webhook/github/route.ts | 55 ++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/app/api/webhook/github/route.ts b/app/api/webhook/github/route.ts
index 9d872f0f..b1be2767 100644
--- a/app/api/webhook/github/route.ts
+++ b/app/api/webhook/github/route.ts
@@ -85,14 +85,20 @@ export async function POST(request: Request) {
           break;
           
         case "repository":
-          const owner = data.repository.owner.login;
-          const repoName = data.repository.name;
+          const owner = data.repository?.owner?.login;  
+          const repoName = data.repository?.name;       
+          const repoId = data.repository?.id;
+          
+          if (!owner || !repoName || !repoId) {
+            console.error("Missing repository data in webhook", { owner, repoName, repoId });
+            break;
+          }
           
           if (data.action === "deleted") {
             // Repository deleted
             await Promise.all([
               db.delete(collaboratorTable).where(
-                eq(collaboratorTable.repoId, data.repository.id)
+                eq(collaboratorTable.repoId, repoId)
               ),
               clearFileCache(owner, repoName)
             ]);
@@ -102,22 +108,25 @@ export async function POST(request: Request) {
             
             await Promise.all([
               db.delete(collaboratorTable).where(
-                eq(collaboratorTable.repoId, data.repository.id)
+                eq(collaboratorTable.repoId, repoId)
               ),
               clearFileCache(oldOwner, repoName)
             ]);
           } else if (data.action === "renamed") {
             // Repository renamed
-            const oldName = data.changes.repository.name.from;
-            const newName = data.repository.name;
+            const oldName = data.changes?.repository?.name?.from;
+            if (!oldName) {
+              console.error("Missing old repository name in rename event");
+              break;
+            }
             
             await Promise.all([
               db.update(collaboratorTable).set({
-                repo: newName
+                repo: repoName
               }).where(
-                eq(collaboratorTable.repoId, data.repository.id)
+                eq(collaboratorTable.repoId, repoId)
               ),
-              updateFileCacheRepository(owner, oldName, newName)
+              updateFileCacheRepository(owner, oldName, repoName)
             ]);
           }
           break;
@@ -125,14 +134,20 @@ export async function POST(request: Request) {
         case "installation_target":
           if (data.action === "renamed") {
             // Account renamed
-            const oldOwner = data.changes.login.from;
-            const newOwner = data.account.login;
+            const oldOwner = data.changes?.login?.from;
+            const newOwner = data.account?.login;
+            const accountId = data.account?.id;
+            
+            if (!oldOwner || !newOwner || !accountId) {
+              console.error("Missing account rename data in webhook", { oldOwner, newOwner, accountId });
+              break;
+            }
             
             await Promise.all([
               db.update(collaboratorTable).set({
                 owner: newOwner
               }).where(
-                eq(collaboratorTable.ownerId, data.account.id)
+                eq(collaboratorTable.ownerId, accountId)
               ),
               updateFileCacheOwner(oldOwner, newOwner)
             ]);
@@ -142,19 +157,23 @@ export async function POST(request: Request) {
         case "delete":
           // Branch deleted
           if (data.ref_type === "branch") {
-            const owner = data.repository.owner.login;
-            const repo = data.repository.name;
-            const branch = data.ref.replace('refs/heads/', '');
+            const deleteOwner = data.repository?.owner?.login;
+            const deleteRepo = data.repository?.name;
+            const deleteBranch = data.ref?.replace('refs/heads/', '');
+            
+            if (!deleteOwner || !deleteRepo || !deleteBranch) {
+              console.error("Missing branch deletion data in webhook", { deleteOwner, deleteRepo, deleteBranch });
+              break;
+            }
             
-            await clearFileCache(owner, repo, branch);
+            await clearFileCache(deleteOwner, deleteRepo, deleteBranch);
           }
           break;
           
         case "push":
           // Files changed (added, modified, removed)
-          // Skip cache updates for branch deletions (they're handled by the "delete" event)
           if (data.deleted === true) {
-            console.log("Skipping push event for branch deletion");
+            // Skip cache updates for branch deletions (they're handled by the "delete" event)
             break;
           }
 

From 5a74917e15cf5ae959b188600732811ff3955c66 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 26 Mar 2025 20:18:05 +0800
Subject: [PATCH 84/95] Linking to Discord chat

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 1813626c..b1f4667d 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,10 @@ It offers a user-friendly interface to edit the content of your website or app d
 
 Go to [pagescms.org/docs](https://pagescms.org/docs).
 
+## Community chat
+
+[Join the Discord server](https://pagescms.org/chat) to get help with Pages CMS, share feedback, and connect with other users building with the platform.
+
 ## Built with
 
 - [Next.js](https://nextjs.org/)

From ced341e7ac0ae69de794ef28d4160d77fad86687 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 26 Mar 2025 22:31:43 +0800
Subject: [PATCH 85/95] Fixing RESEND env vars

---
 README.md                   | 2 +-
 lib/actions/auth.ts         | 2 +-
 lib/actions/collaborator.ts | 2 +-
 lib/githubCache.ts          | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b1f4667d..26c53995 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ Variable | Comments
 `GITHUB_APP_WEBHOOK_SECRET` | The secret you picked for your webhook. This is used to ensure the request is coming from GitHub.
 `GITHUB_APP_CLIENT_ID` | GitHub App Client ID from your GitHub App details page.
 `GITHUB_APP_CLIENT_SECRET` | GitHub App Client Secret you generate on theGitHub App details page.
-`RESEND_DOMAIN_EMAIL` | The domain email you use for your Resend account (e.g. `no-reply@mail.resend.com` )
+`RESEND_FROM_EMAIL` | The sender for authentication emails. Must be a verified domain in your Resend account and follow the format `email@example.com` or `Name <email@example.com>`.
 `RESEND_API_KEY` | You'll get that when you create a (free) [Resend](https://resend.com) account to handle emails.
 `SQLITE_URL` | `file:./local.db` for development, `libsql://pages-cms-username.turso.io` for example if you use [Turso](https://turso.tech) (you should, Turso is great).
 `SQLITE_AUTH_TOKEN` | Leave blank for development, otherwise use the token provided by [Turso](https://turso.tech) (if that's what you use).
diff --git a/lib/actions/auth.ts b/lib/actions/auth.ts
index eaf602ec..470e0e07 100644
--- a/lib/actions/auth.ts
+++ b/lib/actions/auth.ts
@@ -51,7 +51,7 @@ const handleEmailSignIn = async (prevState: any, formData: FormData) => {
 	const resend = new Resend(process.env.RESEND_API_KEY);
 
 	const { data, error } = await resend.emails.send({
-		from: `Pages CMS <${process.env.RESEND_DOMAIN_EMAIL}>`,
+		from: process.env.RESEND_FROM_EMAIL!,
 		to: [email],
 		subject: "Sign in link for Pages CMS",
 		react: LoginEmailTemplate({
diff --git a/lib/actions/collaborator.ts b/lib/actions/collaborator.ts
index 243f013c..db3730d1 100644
--- a/lib/actions/collaborator.ts
+++ b/lib/actions/collaborator.ts
@@ -63,7 +63,7 @@ const handleAddCollaborator = async (prevState: any, formData: FormData) => {
 
 		Promise.resolve().then(async () => {
       const { data, error } = await resend.emails.send({
-				from: `Pages CMS <${process.env.RESEND_DOMAIN_EMAIL}>`,
+				from: process.env.RESEND_FROM_EMAIL!,
 				to: [email],
 				subject: `Join "${owner}/${repo}" on Pages CMS`,
 				react: InviteEmailTemplate({
diff --git a/lib/githubCache.ts b/lib/githubCache.ts
index 6cde8e37..9e7d3a48 100644
--- a/lib/githubCache.ts
+++ b/lib/githubCache.ts
@@ -581,13 +581,10 @@ const checkRepoAccess = async (
   
   // Not in cache, check with API
   try {
-    console.log("Checking repo access for", owner, repo, githubId);
     const octokit = createOctokitInstance(token);
     const response = await octokit.rest.repos.get({ owner, repo });
-    console.log("Response", response.status === 200);
     // If successful, cache the result
     if (response.status === 200) {
-      console.log("Caching result");
       await db.insert(cachePermissionTable)
         .values({
           githubId,

From aff9110de14069ee6011e320da9734f6fdcea632 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Wed, 26 Mar 2025 22:40:40 +0800
Subject: [PATCH 86/95] Removing GitHub profile link for collaborators

---
 components/user.tsx | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/components/user.tsx b/components/user.tsx
index aaf3c95d..7df5ab5c 100644
--- a/components/user.tsx
+++ b/components/user.tsx
@@ -67,13 +67,17 @@ export function User({
             : <div className="text-sm font-medium truncate">{user.email}</div>
           }
         </DropdownMenuLabel>
-        <DropdownMenuSeparator />
-        <DropdownMenuItem asChild>
-          <a href={`https://github.com/${user.githubUsername}`} target="_blank" onClick={onClick}>
-            <span className="mr-4">See GitHub profile</span>
-            <ArrowUpRight className="h-3 w-3 ml-auto opacity-50" />
-          </a>
-        </DropdownMenuItem>
+        {user?.githubId && (
+          <>
+            <DropdownMenuSeparator />
+            <DropdownMenuItem asChild>
+              <a href={`https://github.com/${user.githubUsername}`} target="_blank" onClick={onClick}>
+                <span className="mr-4">See GitHub profile</span>
+                <ArrowUpRight className="h-3 w-3 ml-auto opacity-50" />
+              </a>
+            </DropdownMenuItem>
+          </>
+        )}
         <DropdownMenuSeparator />
         <DropdownMenuLabel className="w-40 text-xs text-muted-foreground font-medium">
           Theme

From b0f9eb76b181915db8c9271aba7081d50db63806 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Thu, 27 Mar 2025 20:07:19 +0800
Subject: [PATCH 87/95] Removing old.select

---
 fields/core/old.select/edit-component.tsx | 40 -----------------------
 fields/core/old.select/index.tsx          | 24 --------------
 2 files changed, 64 deletions(-)
 delete mode 100644 fields/core/old.select/edit-component.tsx
 delete mode 100644 fields/core/old.select/index.tsx

diff --git a/fields/core/old.select/edit-component.tsx b/fields/core/old.select/edit-component.tsx
deleted file mode 100644
index 1efe345a..00000000
--- a/fields/core/old.select/edit-component.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-"use client";
-
-import { forwardRef } from "react";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select"
-
-const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLTextAreaElement>) => {
-  const { value, field, onChange } = props;
-
-  return (
-    <Select onValueChange={onChange} value={value}>
-      <SelectTrigger>
-        <SelectValue />
-      </SelectTrigger>
-      <SelectContent>
-        {field.options?.values.map((option: any) => {
-          let value;
-          let label;
-          if (typeof option === "object") {
-            value = option.value;
-            label = option.label;
-          } else {
-            value = option;
-            label = option;
-          }
-          return (
-            <SelectItem key={value} value={value}>{label}</SelectItem>
-          );
-        })}
-      </SelectContent>
-    </Select>
-  )
-});
-
-export { EditComponent };
\ No newline at end of file
diff --git a/fields/core/old.select/index.tsx b/fields/core/old.select/index.tsx
deleted file mode 100644
index cd3eed58..00000000
--- a/fields/core/old.select/index.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { z } from "zod";
-import { Field } from "@/types/field";
-import { EditComponent } from "./edit-component";
-
-const schema = (field: Field) => {
-  let zodSchema;
-
-  if (field.options?.values && Array.isArray(field.options.values)) {
-    const normalizedValues = field.options.values.map((item) => {
-      return typeof item === "object"
-        ? item.value
-        : item;
-    });
-    zodSchema = z.enum(normalizedValues as [string, ...string[]]);
-  } else {
-    zodSchema = z.string();
-  }
-
-  if (!field.required) zodSchema = zodSchema.optional();
-  
-  return zodSchema;
-};
-
-export { schema, EditComponent};
\ No newline at end of file

From ec643a8fa5b39e674fbad66374ad66442bc54a72 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Thu, 27 Mar 2025 21:57:54 +0800
Subject: [PATCH 88/95] Fixing media prefix swap issues

---
 lib/githubImage.ts | 69 +++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/lib/githubImage.ts b/lib/githubImage.ts
index ae7af900..ebcea4cf 100644
--- a/lib/githubImage.ts
+++ b/lib/githubImage.ts
@@ -145,22 +145,34 @@ const swapPrefix = (
   to: string,
   relative = false
 ) => {
-  if (path == null || from == null || to == null) return path;
+  console.log("swapPrefix", path, from, to, relative);
+  if (
+    path == null
+    || from == null
+    || to == null
+    || (from === to)
+    || path.startsWith("//")
+    || path.startsWith("http://")
+    || path.startsWith("https://")
+    || path.startsWith("data:image/")
+    || !path.startsWith(from)
+  ) return path;
   
   let newPath;
   
-  if (from === to) {
-    newPath = path;
-  } else if (path.startsWith(from) && !(from == "/" && path.startsWith("//")) && !path.startsWith("http://") && !path.startsWith("https://") && !path.startsWith("data:image/")) {
-    if (from === "" && to !== "/" && !path.startsWith("/")) {
-      newPath = `${to}/${path}`;
-    } else {
-      newPath = path.replace(from, to);
-    }
+  if (from === "" && to !== "/") {
+    newPath = `${to}/${path}`;
+  } else if (from === "" && to === "/") {
+    newPath = `/${path}`;
   } else {
-    return path;
+    const remainingPath = path.slice(from.length);
+    newPath = to === "/" 
+      ? `/${remainingPath.replace(/^\//, '')}` 
+      : `${to}/${remainingPath.replace(/^\//, '')}`;
   }
 
+  console.log("newPath", newPath);
+
   if (newPath && newPath.startsWith("/") && relative) newPath = newPath.substring(1);
 
   return newPath;
@@ -173,30 +185,23 @@ const htmlSwapPrefix = (
   to: string,
   relative = false
 ) => {
-  if (from === to) return html;
+  if (from === to || html == null || from == null || to == null) return html;
   
   let newHtml = html;
-
-  if (html != null && from != null && to != null) {
-    const matches = getImgSrcs(newHtml);
-    matches.forEach(match => {
-      const src = match[1] || match[2];
-      const quote = match[1] ? "\"" : "'";
-      let newSrc;
-      
-      if (from === to) {
-        newSrc = src;
-      } else if (src.startsWith(from) && !(from == "/" && src.startsWith("//")) && !src.startsWith("http://") && !src.startsWith("https://") && !src.startsWith("data:image/")) {
-        if (from === "" && to !== "/" && !src.startsWith("/")) {
-          newSrc = `${to}/${src}`;
-        } else {
-          newSrc = src.replace(from, to);
-        }
-        if (newSrc && newSrc.startsWith("/") && relative) newSrc = newSrc.substring(1);
-        newHtml = newHtml.replace(`src=${quote}${src}${quote}`, `src=${quote}${newSrc}${quote}`);
-      }
-    });
-  }
+  const matches = getImgSrcs(newHtml);
+  
+  matches.forEach(match => {
+    const src = match[1] || match[2];
+    const quote = match[1] ? "\"" : "'";
+    
+    const newSrc = swapPrefix(src, from, to, relative);
+    if (newSrc !== src) {
+      // Use a regex with global flag to replace all occurrences
+      const escapedSrc = src.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // Escape special regex chars
+      const regex = new RegExp(`src=${quote}${escapedSrc}${quote}`, 'g');
+      newHtml = newHtml.replace(regex, `src=${quote}${newSrc}${quote}`);
+    }
+  });
 
   return newHtml;
 }

From f6b033136cdf34bfe2b4d8d087b5b7d6059c1f41 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Thu, 27 Mar 2025 22:19:17 +0800
Subject: [PATCH 89/95] Remove debugging messages

---
 lib/githubImage.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/githubImage.ts b/lib/githubImage.ts
index ebcea4cf..235a44c7 100644
--- a/lib/githubImage.ts
+++ b/lib/githubImage.ts
@@ -145,7 +145,6 @@ const swapPrefix = (
   to: string,
   relative = false
 ) => {
-  console.log("swapPrefix", path, from, to, relative);
   if (
     path == null
     || from == null
@@ -171,8 +170,6 @@ const swapPrefix = (
       : `${to}/${remainingPath.replace(/^\//, '')}`;
   }
 
-  console.log("newPath", newPath);
-
   if (newPath && newPath.startsWith("/") && relative) newPath = newPath.substring(1);
 
   return newPath;

From 1309f0dc4933b3f536171dbbc381f7c22e007a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Fri, 28 Mar 2025 16:30:40 +0100
Subject: [PATCH 90/95] Add number buttons component

---
 .../custom/number-buttons/edit-component.tsx  | 23 +++++++++++++++++++
 fields/custom/number-buttons/index.tsx        | 14 +++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 fields/custom/number-buttons/edit-component.tsx
 create mode 100644 fields/custom/number-buttons/index.tsx

diff --git a/fields/custom/number-buttons/edit-component.tsx b/fields/custom/number-buttons/edit-component.tsx
new file mode 100644
index 00000000..22ff7d63
--- /dev/null
+++ b/fields/custom/number-buttons/edit-component.tsx
@@ -0,0 +1,23 @@
+"use client";
+
+import { forwardRef } from "react";
+import { Input } from "@/components/ui/input";
+import { Button } from "@/components/ui/button";
+
+const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>) => {
+  const { value, onChange } = props;
+  
+  function changeValue(i) {
+    onChange(+value + i);
+  }
+  
+  return (
+    <div className="flex items-center gap-1">
+      <Button onClick={() => changeValue(-1)} type="button">-</Button>
+      <Input {...props} ref={ref} type="number" className="text-base max-w-xs" />
+      <Button onClick={() => changeValue(1)} type="button">+</Button>
+    </div>
+  );
+});
+
+export { EditComponent };
\ No newline at end of file
diff --git a/fields/custom/number-buttons/index.tsx b/fields/custom/number-buttons/index.tsx
new file mode 100644
index 00000000..d9313ae0
--- /dev/null
+++ b/fields/custom/number-buttons/index.tsx
@@ -0,0 +1,14 @@
+import { z } from "zod";
+import { Field } from "@/types/field";
+import { EditComponent } from "./edit-component";
+
+const schema = (field: Field) => {
+  let zodSchema = z.coerce.number();
+
+  if (field.options?.min !== undefined) zodSchema = zodSchema.min(field.options.min as number, { message: `Minimum value is ${field.options.min}` });
+  if (field.options?.max !== undefined) zodSchema = zodSchema.max(field.options.max as number, { message: `Maximum value is ${field.options.max}` });
+
+  return z.literal("").refine(() => !field.required, { message: "This field is required" }).or(zodSchema);
+};
+
+export { schema, EditComponent };
\ No newline at end of file

From d413313778ccfafd22258e2fe46dfd57d64cec68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Sat, 29 Mar 2025 13:08:44 +0100
Subject: [PATCH 91/95] Fix redirect URL for GitHub app management

---
 components/installations.tsx | 4 ++--
 lib/utils/accounts.ts        | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/installations.tsx b/components/installations.tsx
index 9fa351b3..9c0e516f 100644
--- a/components/installations.tsx
+++ b/components/installations.tsx
@@ -27,8 +27,8 @@ const Installations = () => {
           <Button size="sm" variant="outline" className="h-8 ml-auto" asChild>
             <a
               href={account.type === 'org' 
-                ? `https://github.com/organizations/${account.login}/settings/installations`
-                : 'https://github.com/settings/installations'} 
+                ? `https://github.com/organizations/${account.login}/settings/installations/${account.installationId ?? ''}`
+                : `https://github.com/settings/installations/${account.installationId ?? ''}`} 
               target="_blank"
             >
               Manage
diff --git a/lib/utils/accounts.ts b/lib/utils/accounts.ts
index 82d8c507..aeaab606 100644
--- a/lib/utils/accounts.ts
+++ b/lib/utils/accounts.ts
@@ -22,20 +22,23 @@ const getAccounts = async (user: User) => {
 			...installations.map((installation: any) => ({
 				login: installation.account.login,
 				type: installation.account.type === "User" ? "user" : "org",
-				repositorySelection: installation.repository_selection
+				repositorySelection: installation.repository_selection,
+				installationId: installation.id
 			}))
 		];
 	} else {
 		const groupedRepos = await db
 			.select({
 				owner: collaboratorTable.owner,
-				type: collaboratorTable.type
+				type: collaboratorTable.type,
+				installationId: collaboratorTable.installationId
 			})
 			.from(collaboratorTable)
 			.where(eq(collaboratorTable.email, user.email))
 			.groupBy(collaboratorTable.ownerId);
 
 		accounts = groupedRepos.map(collaborator => ({
+			installationId: collaborator.installationId,
 			login: collaborator.owner,
 			type: collaborator.type,
 			repositorySelection: "selected"

From c6596fdedd449bc9eab0ce1b2ed71af4d7c2b005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Sat, 29 Mar 2025 13:14:40 +0100
Subject: [PATCH 92/95] Remove unwanted changes

---
 .../custom/number-buttons/edit-component.tsx  | 23 -------------------
 fields/custom/number-buttons/index.tsx        | 14 -----------
 2 files changed, 37 deletions(-)
 delete mode 100644 fields/custom/number-buttons/edit-component.tsx
 delete mode 100644 fields/custom/number-buttons/index.tsx

diff --git a/fields/custom/number-buttons/edit-component.tsx b/fields/custom/number-buttons/edit-component.tsx
deleted file mode 100644
index 22ff7d63..00000000
--- a/fields/custom/number-buttons/edit-component.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-"use client";
-
-import { forwardRef } from "react";
-import { Input } from "@/components/ui/input";
-import { Button } from "@/components/ui/button";
-
-const EditComponent = forwardRef((props: any, ref: React.Ref<HTMLInputElement>) => {
-  const { value, onChange } = props;
-  
-  function changeValue(i) {
-    onChange(+value + i);
-  }
-  
-  return (
-    <div className="flex items-center gap-1">
-      <Button onClick={() => changeValue(-1)} type="button">-</Button>
-      <Input {...props} ref={ref} type="number" className="text-base max-w-xs" />
-      <Button onClick={() => changeValue(1)} type="button">+</Button>
-    </div>
-  );
-});
-
-export { EditComponent };
\ No newline at end of file
diff --git a/fields/custom/number-buttons/index.tsx b/fields/custom/number-buttons/index.tsx
deleted file mode 100644
index d9313ae0..00000000
--- a/fields/custom/number-buttons/index.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { z } from "zod";
-import { Field } from "@/types/field";
-import { EditComponent } from "./edit-component";
-
-const schema = (field: Field) => {
-  let zodSchema = z.coerce.number();
-
-  if (field.options?.min !== undefined) zodSchema = zodSchema.min(field.options.min as number, { message: `Minimum value is ${field.options.min}` });
-  if (field.options?.max !== undefined) zodSchema = zodSchema.max(field.options.max as number, { message: `Maximum value is ${field.options.max}` });
-
-  return z.literal("").refine(() => !field.required, { message: "This field is required" }).or(zodSchema);
-};
-
-export { schema, EditComponent };
\ No newline at end of file

From 26df50be5a6873cfbdef562260a59cce03eb384b Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Sun, 30 Mar 2025 17:24:52 +0800
Subject: [PATCH 93/95] Adding default routing for media, fixing media upload
 bugs and fixing select field labels

---
 README.md                                   |  4 +++-
 app/(main)/[owner]/[repo]/[branch]/page.tsx |  2 +-
 components/media/media-upload.tsx           |  8 ++++----
 fields/core/select/edit-component.tsx       | 20 +++++++++++---------
 fields/core/select/index.tsx                | 18 ++++++++++--------
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 26c53995..15543db3 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,9 @@ You will need to fill in the following information:
     - Account permissions: nothing.
 - **Subscribe to events**:
     - Installation target
-    - Repository (you'll probably need to add this after creating the GitHub App)
+    - Repository
+    - Push
+    - Delete
 - **Where can this GitHub App be installed?**: you'll want to select "Any account" unless you intend to only use Pages CMS on the account this GitHub App is created under.
 
 ### Environment variables
diff --git a/app/(main)/[owner]/[repo]/[branch]/page.tsx b/app/(main)/[owner]/[repo]/[branch]/page.tsx
index 7f8bc3ec..ea756bb2 100644
--- a/app/(main)/[owner]/[repo]/[branch]/page.tsx
+++ b/app/(main)/[owner]/[repo]/[branch]/page.tsx
@@ -14,7 +14,7 @@ export default function Page() {
     if (config?.object.content?.[0]) {
       router.replace(`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/${config.object.content[0].type}/${config.object.content[0].name}`);
     } else if (config?.object.media) {
-      router.replace(`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media`);
+      router.replace(`/${config.owner}/${config.repo}/${encodeURIComponent(config.branch)}/media/${config.object.media[0].name}`);
     } else if (config?.object.settings !== false) {
       router.replace(`/${config?.owner}/${config?.repo}/${encodeURIComponent(config!.branch)}/settings`);
     } else {
diff --git a/components/media/media-upload.tsx b/components/media/media-upload.tsx
index 15f3f3db..a25baf44 100644
--- a/components/media/media-upload.tsx
+++ b/components/media/media-upload.tsx
@@ -48,12 +48,12 @@ function MediaUploadRoot({ children, path, onUpload, media, extensions, multiple
     if (!configMedia?.extensions && !extensions) return undefined;
     
     const allowedExtensions = extensions 
-      ? configMedia.extensions
+      ? configMedia?.extensions
         ? extensions.filter(ext => configMedia.extensions.includes(ext))
         : extensions
-      : configMedia.extensions;
+      : configMedia?.extensions;
 
-    return allowedExtensions.length > 0
+    return allowedExtensions?.length > 0
       ? allowedExtensions.map((extension: string) => `.${extension}`).join(",")
       : undefined;
   }, [extensions, configMedia?.extensions]);
@@ -107,7 +107,7 @@ function MediaUploadRoot({ children, path, onUpload, media, extensions, multiple
     } catch (error) {
       console.error(error);
     }
-  }, [config, path, configMedia.name, onUpload]);
+  }, [config, path, configMedia?.name, onUpload]);
 
   const contextValue = useMemo(() => ({
     handleFiles,
diff --git a/fields/core/select/edit-component.tsx b/fields/core/select/edit-component.tsx
index 9c453733..6303f7c6 100644
--- a/fields/core/select/edit-component.tsx
+++ b/fields/core/select/edit-component.tsx
@@ -151,21 +151,23 @@ const EditComponent = forwardRef((props: any, ref: any) => {
 
   const handleChange = useCallback(
     (newValue: any) => {
-      // When a new value is selected, ensure we display the value, not the label
-      const selectedValue = newValue 
-        ? field.options?.multiple 
-          ? newValue.map((item: any) => ({ value: item.value, label: item.value }))
-          : { value: newValue.value, label: newValue.value }
-        : field.options?.multiple ? [] : null;
-      
-      setSelectedOptions(selectedValue);
+      if (!field.options?.fetch) {
+        setSelectedOptions(newValue);
+      } else {
+        const selectedValue = newValue 
+          ? field.options?.multiple 
+            ? newValue.map((item: any) => ({ value: item.value, label: item.value }))
+            : { value: newValue.value, label: newValue.value }
+          : field.options?.multiple ? [] : null;
+        setSelectedOptions(selectedValue);
+      }
 
       const output = field.options?.multiple
         ? newValue ? newValue.map((item: any) => item.value) : []
         : newValue ? newValue.value : null;
       onChange(output);
     },
-    [onChange, field.options?.multiple, field]
+    [onChange, field.options?.multiple, field.options?.fetch]
   );
 
   if (!isMounted) return null;
diff --git a/fields/core/select/index.tsx b/fields/core/select/index.tsx
index 2290dcc5..ba643ab4 100644
--- a/fields/core/select/index.tsx
+++ b/fields/core/select/index.tsx
@@ -8,26 +8,28 @@ const schema = (field: Field) => {
   if (!field.options?.creatable && !field.options?.fetch && field.options?.values && Array.isArray(field.options.values)) {
     const normalizedValues = field.options.values.map((item) => {
       return typeof item === "object"
-        ? item.value
-        : item;
+        ? String(item.value)
+        : String(item);
     });
-    zodSchema = z.enum(normalizedValues as [string, ...string[]]).optional();
+    zodSchema = z.enum(normalizedValues as [string, ...string[]]);
   } else {
-    zodSchema = z.coerce.string();
+    zodSchema = z.string().nullable();
   }
 
   if (field.options?.multiple) {
     zodSchema = z.preprocess(
       (val) => {
-        if (val === "" || val === null) return undefined;
-        return val;
+        if (val === "" || val === null) return [];
+        // Ensure array values are converted to strings
+        return Array.isArray(val) ? val.map(String) : val;
       },
       z.array(zodSchema)
     );
   }
   
-  // TODO: optional array
-  if (!field.required) zodSchema = zodSchema.optional();
+  if (!field.required) {
+    zodSchema = zodSchema.nullable();
+  }
   
   return zodSchema;
 };

From a740658f4af01c86552ce43ff1a283838b24d800 Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 15 Apr 2025 09:58:29 +0800
Subject: [PATCH 94/95] Revert "Merge pull request #220 from
 Meldiron/fix-manage-redirect"

This reverts commit 67b15056848fde3bdc36b5e9e7ddd01c693704ff, reversing
changes made to 26df50be5a6873cfbdef562260a59cce03eb384b.
---
 components/installations.tsx | 4 ++--
 lib/utils/accounts.ts        | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/components/installations.tsx b/components/installations.tsx
index 9c0e516f..9fa351b3 100644
--- a/components/installations.tsx
+++ b/components/installations.tsx
@@ -27,8 +27,8 @@ const Installations = () => {
           <Button size="sm" variant="outline" className="h-8 ml-auto" asChild>
             <a
               href={account.type === 'org' 
-                ? `https://github.com/organizations/${account.login}/settings/installations/${account.installationId ?? ''}`
-                : `https://github.com/settings/installations/${account.installationId ?? ''}`} 
+                ? `https://github.com/organizations/${account.login}/settings/installations`
+                : 'https://github.com/settings/installations'} 
               target="_blank"
             >
               Manage
diff --git a/lib/utils/accounts.ts b/lib/utils/accounts.ts
index aeaab606..82d8c507 100644
--- a/lib/utils/accounts.ts
+++ b/lib/utils/accounts.ts
@@ -22,23 +22,20 @@ const getAccounts = async (user: User) => {
 			...installations.map((installation: any) => ({
 				login: installation.account.login,
 				type: installation.account.type === "User" ? "user" : "org",
-				repositorySelection: installation.repository_selection,
-				installationId: installation.id
+				repositorySelection: installation.repository_selection
 			}))
 		];
 	} else {
 		const groupedRepos = await db
 			.select({
 				owner: collaboratorTable.owner,
-				type: collaboratorTable.type,
-				installationId: collaboratorTable.installationId
+				type: collaboratorTable.type
 			})
 			.from(collaboratorTable)
 			.where(eq(collaboratorTable.email, user.email))
 			.groupBy(collaboratorTable.ownerId);
 
 		accounts = groupedRepos.map(collaborator => ({
-			installationId: collaborator.installationId,
 			login: collaborator.owner,
 			type: collaborator.type,
 			repositorySelection: "selected"

From ee59a711e28caa74799146a52654586a1929a9eb Mon Sep 17 00:00:00 2001
From: Ronan Berder <hunvreus@gmail.com>
Date: Tue, 15 Apr 2025 10:28:12 +0800
Subject: [PATCH 95/95] Fix upload bug

---
 lib/schema.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/schema.ts b/lib/schema.ts
index fa9d56a1..53cca2c1 100644
--- a/lib/schema.ts
+++ b/lib/schema.ts
@@ -186,7 +186,12 @@ const getSchemaByPath = (config: Record<string, any>, path: string) => {
 
 // Retrieve the matching schema for a media or content entry
 const getSchemaByName = (config: Record<string, any> | null | undefined, name: string, type: string = "content") => {
-  if (!config || !config.content || !name) return null;
+  if (
+    !config
+    || (type === "media" && !config.media)
+    || (type === "content" && !config.content)
+    || !name
+  ) return null;
   
   const schema = (type === "media")
     ? config.media.find((item: Record<string, any>) => item.name === name)