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

packages/opencode/src/reference/reference.ts

@@ -1,6 +1,6 @@
 import path from "path"
 import { Effect, Context, Layer, Scope } from "effect"
-import { AppFileSystem } from "@opencode-ai/core/filesystem"
+import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Global } from "@opencode-ai/core/global"
 import { Config } from "@/config/config"
 import { ConfigReference } from "@/config/reference"
@@ -83,11 +83,11 @@ function branchLabel(branch: string | undefined) {
 
 function normalizedTarget(target?: string) {
   if (!target) return
-  return process.platform === "win32" ? AppFileSystem.normalizePath(target) : target
+  return process.platform === "win32" ? FSUtil.normalizePath(target) : target
 }
 
 function containsReferencePath(referencePath: string, target: string) {
-  return AppFileSystem.contains(normalizedTarget(referencePath) ?? referencePath, target)
+  return FSUtil.contains(normalizedTarget(referencePath) ?? referencePath, target)
 }
 
 function uniqueGitReferences(references: Resolved[]) {

packages/opencode/src/reference/repository-cache.ts

@@ -1,6 +1,6 @@
 import path from "path"
 import { Context, Effect, Layer, Schema } from "effect"
-import { AppFileSystem } from "@opencode-ai/core/filesystem"
+import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Flock } from "@opencode-ai/core/util/flock"
 import { Git } from "@/git"
 import {
@@ -168,7 +168,7 @@ export const validateBranch = Effect.fn("RepositoryCache.validateBranch")(functi
 const ensureWithServices = Effect.fn("RepositoryCache.ensureWithServices")(function* (
   input: EnsureInput,
   services: {
-    fs: AppFileSystem.Interface
+    fs: FSUtil.Interface
     git: Git.Interface
   },
 ) {
@@ -298,10 +298,10 @@ const ensureWithServices = Effect.fn("RepositoryCache.ensureWithServices")(funct
   )
 })
 
-export const layer: Layer.Layer<Service, never, AppFileSystem.Service | Git.Service> = Layer.effect(
+export const layer: Layer.Layer<Service, never, FSUtil.Service | Git.Service> = Layer.effect(
   Service,
   Effect.gen(function* () {
-    const fs = yield* AppFileSystem.Service
+    const fs = yield* FSUtil.Service
     const git = yield* Git.Service
 
     return Service.of({
@@ -313,7 +313,7 @@ export const layer: Layer.Layer<Service, never, AppFileSystem.Service | Git.Serv
 )
 
 export const defaultLayer: Layer.Layer<Service> = layer.pipe(
-  Layer.provide(AppFileSystem.defaultLayer),
+  Layer.provide(FSUtil.defaultLayer),
   Layer.provide(Git.defaultLayer),
 )