1 files changed, 22 insertions, 1 deletions

diff --git a/frontend/lib/drive_server.ts b/frontend/lib/drive_server.ts
index 7e2193c..e6dd833 100644
--- a/frontend/lib/drive_server.ts
+++ b/frontend/lib/drive_server.ts
@@ -142,5 +142,26 @@ export async function Drive_tree(): Promise<DriveTreeResponse> {
     }
   });
 
-  return { root: rootNodes };
+  // Third pass: sort all levels (directories first, then files, both alphabetically)
+  const sortNodes = (nodes: DriveTreeNode[]): DriveTreeNode[] => {
+    const sorted = nodes.sort((a, b) => {
+      // Directories first, then files
+      if (a.type === "dir" && b.type === "file") return -1;
+      if (a.type === "file" && b.type === "dir") return 1;
+      
+      // Both same type, sort alphabetically by name (case-insensitive)
+      return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+    });
+
+    // Recursively sort children
+    sorted.forEach(node => {
+      if (node.children) {
+        node.children = sortNodes(node.children);
+      }
+    });
+
+    return sorted;
+  };
+
+  return { root: sortNodes(rootNodes) };
 }
\ No newline at end of file