diff --git a/packages/opencode/src/file/index.ts b/packages/opencode/src/file/index.ts
index 80cff630..e5023f0d 100644
--- a/packages/opencode/src/file/index.ts
+++ b/packages/opencode/src/file/index.ts
@@ -250,7 +250,7 @@ export namespace File {
     log.info("search", { query: input.query })
     const limit = input.limit ?? 100
     const result = await state().then((x) => x.files())
-    if (!input.query) return result.dirs.toSorted()
+    if (!input.query) return result.dirs.toSorted().slice(0, limit)
     const items = [...result.files, ...result.dirs]
     const sorted = fuzzysort.go(input.query, items, { limit: limit }).map((r) => r.target)
     log.info("search", { query: input.query, results: sorted.length })
diff --git a/packages/opencode/src/project/bootstrap.ts b/packages/opencode/src/project/bootstrap.ts
index 55ab88f3..a3037528 100644
--- a/packages/opencode/src/project/bootstrap.ts
+++ b/packages/opencode/src/project/bootstrap.ts
@@ -4,6 +4,7 @@ import { Format } from "../format"
 import { LSP } from "../lsp"
 import { Snapshot } from "../snapshot"
 import { FileWatcher } from "../file/watcher"
+import { File } from "../file"
 
 export async function InstanceBootstrap() {
   await Plugin.init()
@@ -12,4 +13,5 @@ export async function InstanceBootstrap() {
   LSP.init()
   Snapshot.init()
   FileWatcher.init()
+  File.init()
 }