From 1259d9c3aa7eb429e433518b3d090bba124adb56 Mon Sep 17 00:00:00 2001
From: johnnyapu15 <johnnyapu15@gmail.com>
Date: Tue, 13 Jan 2026 08:09:29 +0000
Subject: [PATCH] Fix empty query in file search

---
 packages/app/src/context/file.tsx  | 12 ++++++++----
 packages/app/src/context/local.tsx | 11 ++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/app/src/context/file.tsx b/packages/app/src/context/file.tsx
index 2cc0d62de76..0cd085f85f5 100644
--- a/packages/app/src/context/file.tsx
+++ b/packages/app/src/context/file.tsx
@@ -384,10 +384,14 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
       setScrollLeft,
       selectedLines,
       setSelectedLines,
-      searchFiles: (query: string) =>
-        sdk.client.find.files({ query, dirs: "false" }).then((x) => (x.data ?? []).map(normalize)),
-      searchFilesAndDirectories: (query: string) =>
-        sdk.client.find.files({ query, dirs: "true" }).then((x) => (x.data ?? []).map(normalize)),
+      searchFiles: (query: string | undefined) => {
+        const safeQuery = query ?? ""
+        return sdk.client.find.files({ query: safeQuery, dirs: "false" }).then((x) => (x.data ?? []).map(normalize))
+      },
+      searchFilesAndDirectories: (query: string | undefined) => {
+        const safeQuery = query ?? ""
+        return sdk.client.find.files({ query: safeQuery, dirs: "true" }).then((x) => (x.data ?? []).map(normalize))
+      },
     }
   },
 })
diff --git a/packages/app/src/context/local.tsx b/packages/app/src/context/local.tsx
index 2ed57234f29..526361bfd98 100644
--- a/packages/app/src/context/local.tsx
+++ b/packages/app/src/context/local.tsx
@@ -467,9 +467,14 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
           .catch(() => {})
       }
 
-      const searchFiles = (query: string) => sdk.client.find.files({ query, dirs: "false" }).then((x) => x.data!)
-      const searchFilesAndDirectories = (query: string) =>
-        sdk.client.find.files({ query, dirs: "true" }).then((x) => x.data!)
+      const searchFiles = (query: string | undefined) => {
+        const safeQuery = query ?? ""
+        return sdk.client.find.files({ query: safeQuery, dirs: "false" }).then((x) => x.data!)
+      }
+      const searchFilesAndDirectories = (query: string | undefined) => {
+        const safeQuery = query ?? ""
+        return sdk.client.find.files({ query: safeQuery, dirs: "true" }).then((x) => x.data!)
+      }
 
       const unsub = sdk.event.listen((e) => {
         const event = e.details