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

packages/opencode/test/project/project.test.ts

@@ -17,7 +17,7 @@ import { WorkspaceV2 } from "@opencode-ai/core/workspace"
 import { Cause, Effect, Exit, Layer, Stream } from "effect"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import { NodePath } from "@effect/platform-node"
-import { AppFileSystem } from "@opencode-ai/core/filesystem"
+import { FSUtil } from "@opencode-ai/core/fs-util"
 import { AppProcess } from "@opencode-ai/core/process"
 import { ProjectV2 } from "@opencode-ai/core/project"
 import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
@@ -76,7 +76,7 @@ function projectLayerWithFailure(failArg: string) {
     Layer.provide(mockGitFailure(failArg)),
     Layer.provide(ProjectV2.defaultLayer),
     Layer.provide(EventV2Bridge.defaultLayer),
-    Layer.provide(AppFileSystem.defaultLayer),
+    Layer.provide(FSUtil.defaultLayer),
     Layer.provide(NodePath.layer),
     Layer.provide(Database.defaultLayer),
     Layer.provide(RuntimeFlags.defaultLayer),
@@ -88,7 +88,7 @@ function projectLayerWithRuntimeFlags(flags: Parameters<typeof RuntimeFlags.laye
     Layer.provide(EventV2Bridge.defaultLayer),
     Layer.provide(ProjectV2.defaultLayer),
     Layer.provide(AppProcess.defaultLayer),
-    Layer.provide(AppFileSystem.defaultLayer),
+    Layer.provide(FSUtil.defaultLayer),
     Layer.provide(NodePath.layer),
     Layer.provide(Database.defaultLayer),
     Layer.provide(RuntimeFlags.layer(flags)),

packages/opencode/test/project/vcs.test.ts

@@ -1,5 +1,5 @@
 import { afterEach, describe, expect } from "bun:test"
-import { AppFileSystem } from "@opencode-ai/core/filesystem"
+import { FSUtil } from "@opencode-ai/core/fs-util"
 import { parsePatch } from "diff"
 import { Deferred, Effect, Layer } from "effect"
 import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
@@ -13,7 +13,7 @@ import {
   tmpdirScoped,
 } from "../fixture/fixture"
 import { EventV2Bridge } from "../../src/event-v2-bridge"
-import { FileWatcher } from "../../src/file/watcher"
+import { Watcher } from "@opencode-ai/core/filesystem/watcher"
 import { Git } from "../../src/git"
 import { Vcs } from "@/project/vcs"
 import { testEffect } from "../lib/effect"
@@ -27,7 +27,7 @@ const weird = process.platform === "win32" ? "space file.txt" : "tab\tfile.txt"
 const layer = Layer.mergeAll(
   Vcs.layer.pipe(Layer.provideMerge(Git.defaultLayer), Layer.provideMerge(EventV2Bridge.defaultLayer)),
   CrossSpawnSpawner.defaultLayer,
-  AppFileSystem.defaultLayer,
+  FSUtil.defaultLayer,
 )
 const it = testEffect(layer)
 const worktreeIt = testEffect(Layer.mergeAll(layer, testInstanceStoreLayer))
@@ -38,11 +38,11 @@ const git = Effect.fn("VcsTest.git")(function* (cwd: string, args: string[]) {
 })
 
 const write = Effect.fn("VcsTest.write")(function* (file: string, content: string) {
-  yield* AppFileSystem.Service.use((fs) => fs.writeWithDirs(file, content))
+  yield* FSUtil.Service.use((fs) => fs.writeWithDirs(file, content))
 })
 
 const remove = Effect.fn("VcsTest.remove")(function* (file: string) {
-  yield* AppFileSystem.Service.use((fs) => fs.remove(file))
+  yield* FSUtil.Service.use((fs) => fs.remove(file))
 })
 
 const symlink = (target: string, file: string) => Effect.promise(() => fs.symlink(target, file))
@@ -73,7 +73,7 @@ const publishHeadChangeUntil = Effect.fn("VcsTest.publishHeadChangeUntil")(funct
 ) {
   const events = yield* EventV2Bridge.Service
   for (let i = 0; i < 50; i++) {
-    yield* events.publish(FileWatcher.Event.Updated, { file: head, event: "change" })
+    yield* events.publish(Watcher.Event.Updated, { file: head, event: "change" })
     if (yield* Deferred.isDone(pending)) return
     yield* Effect.sleep("10 millis")
   }

packages/opencode/test/project/worktree.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, describe, expect } from "bun:test"
 import path from "path"
-import { AppFileSystem } from "@opencode-ai/core/filesystem"
+import { FSUtil } from "@opencode-ai/core/fs-util"
 import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
 import { Cause, Deferred, Effect, Exit, Fiber, Layer } from "effect"
 import { GlobalBus, type GlobalEvent } from "../../src/bus/global"
@@ -10,7 +10,7 @@ import { disposeAllInstances, provideInstance, TestInstance } from "../fixture/f
 import { testEffect } from "../lib/effect"
 
 const it = testEffect(
-  Layer.mergeAll(Worktree.defaultLayer, AppFileSystem.defaultLayer, CrossSpawnSpawner.defaultLayer, Git.defaultLayer),
+  Layer.mergeAll(Worktree.defaultLayer, FSUtil.defaultLayer, CrossSpawnSpawner.defaultLayer, Git.defaultLayer),
 )
 const wintest = process.platform !== "win32" ? it.instance : it.instance.skip
 
@@ -265,7 +265,7 @@ describe("Worktree", () => {
       () =>
         Effect.gen(function* () {
           const test = yield* TestInstance
-          const fs = yield* AppFileSystem.Service
+          const fs = yield* FSUtil.Service
           const svc = yield* Worktree.Service
           const parent = path.join(path.dirname(test.directory), `${path.basename(test.directory)}-parent`)
           const target = path.join(parent, path.basename(test.directory))