refactor(core): consolidate filesystem services (#30447)

packages/opencode/src/cli/cmd/debug/file.ts

@@ -1,10 +1,18 @@
 import { EOL } from "os"
 import { Effect } from "effect"
-import { File } from "../../../file"
-import { Ripgrep } from "@/file/ripgrep"
+import { FileSystem } from "@opencode-ai/core/filesystem"
+import { LocationServiceMap } from "@opencode-ai/core/location-layer"
+import { Ripgrep } from "@opencode-ai/core/filesystem/ripgrep"
+import { AbsolutePath, RelativePath } from "@opencode-ai/core/schema"
 import { effectCmd } from "../../effect-cmd"
 import { cmd } from "../cmd"
 
+const filesystem = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+  effect.pipe(
+    Effect.provide(LocationServiceMap.get({ directory: AbsolutePath.make(process.cwd()) })),
+    Effect.provide(LocationServiceMap.layer),
+  )
+
 const FileSearchCommand = effectCmd({
   command: "search <query>",
   describe: "search files by query",
@@ -15,8 +23,8 @@ const FileSearchCommand = effectCmd({
       description: "Search query",
     }),
   handler: Effect.fn("Cli.debug.file.search")(function* (args) {
-    const results = yield* File.Service.use((svc) => svc.search({ query: args.query }))
-    process.stdout.write(results.join(EOL) + EOL)
+    const results = yield* filesystem(FileSystem.Service.use((svc) => svc.find({ query: args.query })))
+    process.stdout.write(results.map((item) => item.path).join(EOL) + EOL)
   }),
 })
 
@@ -30,21 +38,11 @@ const FileReadCommand = effectCmd({
       description: "File path to read",
     }),
   handler: Effect.fn("Cli.debug.file.read")(function* (args) {
-    const content = yield* File.Service.use((svc) => svc.read(args.path))
+    const content = yield* filesystem(FileSystem.Service.use((svc) => svc.read({ path: RelativePath.make(args.path) })))
     process.stdout.write(JSON.stringify(content, null, 2) + EOL)
   }),
 })
 
-const FileStatusCommand = effectCmd({
-  command: "status",
-  describe: "show file status information",
-  builder: (yargs) => yargs,
-  handler: Effect.fn("Cli.debug.file.status")(function* () {
-    const status = yield* File.Service.use((svc) => svc.status())
-    process.stdout.write(JSON.stringify(status, null, 2) + EOL)
-  }),
-})
-
 const FileListCommand = effectCmd({
   command: "list <path>",
   describe: "list files in a directory",
@@ -55,7 +53,7 @@ const FileListCommand = effectCmd({
       description: "File path to list",
     }),
   handler: Effect.fn("Cli.debug.file.list")(function* (args) {
-    const files = yield* File.Service.use((svc) => svc.list(args.path))
+    const files = yield* filesystem(FileSystem.Service.use((svc) => svc.list({ path: RelativePath.make(args.path) })))
     process.stdout.write(JSON.stringify(files, null, 2) + EOL)
   }),
 })
@@ -81,7 +79,6 @@ export const FileCommand = cmd({
   builder: (yargs) =>
     yargs
       .command(FileReadCommand)
-      .command(FileStatusCommand)
       .command(FileListCommand)
       .command(FileSearchCommand)
       .command(FileTreeCommand)

packages/opencode/src/cli/cmd/debug/ripgrep.ts

@@ -1,6 +1,6 @@
 import { EOL } from "os"
 import { Effect, Stream } from "effect"
-import { Ripgrep } from "../../../file/ripgrep"
+import { Ripgrep } from "@opencode-ai/core/filesystem/ripgrep"
 import { effectCmd } from "../../effect-cmd"
 import { cmd } from "../cmd"
 import { InstanceRef } from "@/effect/instance-ref"