test(core): simplify repository cache layer wiring

packages/core/src/file-mutation.ts

@@ -3,7 +3,6 @@ export * as FileMutation from "./file-mutation"
 import { Context, Effect, Layer, Schema } from "effect"
 import { dirname } from "path"
 import { KeyedMutex } from "./effect/keyed-mutex"
-import { LayerNode } from "./effect/layer-node"
 import { FSUtil } from "./fs-util"
 
 export interface Target {
@@ -172,8 +171,6 @@ export const layer = Layer.effect(
   }),
 )
 
-export const node = LayerNode.make(layer, [FSUtil.node])
-
 function splitBom(text: string) {
   const stripped = text.replace(/^\uFEFF+/, "")
   return { bom: stripped.length !== text.length, text: stripped }

packages/core/src/location-mutation.ts

@@ -2,7 +2,6 @@ export * as LocationMutation from "./location-mutation"
 
 import path from "path"
 import { Context, Effect, Layer, Schema } from "effect"
-import { LayerNode } from "./effect/layer-node"
 import { FSUtil } from "./fs-util"
 import { Location } from "./location"
 
@@ -154,5 +153,3 @@ export const layer = Layer.effect(
 )
 
 export const locationLayer = layer
-
-export const node = (location: LayerNode.Node<Location.Service>) => LayerNode.make(layer, [FSUtil.node, location])

packages/core/src/repository-cache.ts

@@ -1,5 +1,6 @@
 import path from "path"
 import { Context, Effect, Layer, Schema } from "effect"
+import { LayerNode } from "./effect/layer-node"
 import { FSUtil } from "./fs-util"
 import { Git } from "./git"
 import { Global } from "./global"
@@ -258,6 +259,7 @@ export const defaultLayer: Layer.Layer<Service> = layer.pipe(
   Layer.provide(Git.defaultLayer),
   Layer.provide(Global.defaultLayer),
 )
+export const node = LayerNode.make(layer, [FSUtil.node, Git.node, EffectFlock.node, Global.node])
 
 function statusForRepository(input: { reuse: boolean; refresh?: boolean; branchMatches?: boolean }) {
   if (!input.reuse) return "cloned" as const

packages/core/test/file-mutation.test.ts

@@ -2,7 +2,6 @@ import fs from "fs/promises"
 import path from "path"
 import { describe, expect } from "bun:test"
 import { Deferred, Effect, Fiber, Layer } from "effect"
-import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { FileMutation } from "@opencode-ai/core/file-mutation"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 import { Location } from "@opencode-ai/core/location"
@@ -12,16 +11,14 @@ import { location } from "./fixture/location"
 import { tmpdir } from "./fixture/tmpdir"
 import { it } from "./lib/effect"
 
-function provide(directory: string, filesystem?: LayerNode.Replacement<FSUtil.Service>) {
-  const activeLocation = LayerNode.make(
-    Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make(directory) }))),
-    [],
-  )
-  return Effect.provide(
-    LayerNode.buildLayer(LayerNode.group([LocationMutation.node(activeLocation), FileMutation.node]), {
-      replacements: filesystem ? [filesystem] : [],
-    }),
+function provide(directory: string, filesystem = FSUtil.defaultLayer) {
+  const activeLocation = Layer.succeed(
+    Location.Service,
+    Location.Service.of(location({ directory: AbsolutePath.make(directory) })),
   )
+  const resolution = LocationMutation.layer.pipe(Layer.provide(filesystem), Layer.provide(activeLocation))
+  const mutation = FileMutation.layer.pipe(Layer.provide(filesystem))
+  return Effect.provide(Layer.mergeAll(resolution, mutation))
 }
 
 function withTmp<A, E, R>(f: (directory: string) => Effect.Effect<A, E, R>) {
@@ -350,20 +347,17 @@ describe("FileMutation", () => {
 })
 
 function instrumentWrites(run: <E>(write: Effect.Effect<void, E>, target: string) => Effect.Effect<void, E>) {
-  return LayerNode.replace(
-    FSUtil.node,
-    Layer.effect(
-      FSUtil.Service,
-      Effect.gen(function* () {
-        const filesystem = yield* FSUtil.Service
-        return FSUtil.Service.of({
-          ...filesystem,
-          writeWithDirs: (target, content, mode) => run(filesystem.writeWithDirs(target, content, mode), target),
-          writeFile: (target, content, options) => run(filesystem.writeFile(target, content, options), target),
-          writeFileString: (target, content, options) =>
-            run(filesystem.writeFileString(target, content, options), target),
-        })
-      }),
-    ).pipe(Layer.provide(LayerNode.buildLayer(FSUtil.node))),
-  )
+  return Layer.effect(
+    FSUtil.Service,
+    Effect.gen(function* () {
+      const filesystem = yield* FSUtil.Service
+      return FSUtil.Service.of({
+        ...filesystem,
+        writeWithDirs: (target, content, mode) => run(filesystem.writeWithDirs(target, content, mode), target),
+        writeFile: (target, content, options) => run(filesystem.writeFile(target, content, options), target),
+        writeFileString: (target, content, options) =>
+          run(filesystem.writeFileString(target, content, options), target),
+      })
+    }),
+  ).pipe(Layer.provide(FSUtil.defaultLayer))
 }

packages/core/test/repository-cache.test.ts

@@ -3,12 +3,10 @@ import fs from "fs/promises"
 import path from "path"
 import { pathToFileURL } from "url"
 import { Effect, Layer } from "effect"
-import { FSUtil } from "@opencode-ai/core/fs-util"
-import { Git } from "@opencode-ai/core/git"
+import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { Global } from "@opencode-ai/core/global"
 import { Repository } from "@opencode-ai/core/repository"
 import { RepositoryCache } from "@opencode-ai/core/repository-cache"
-import { EffectFlock } from "@opencode-ai/core/util/effect-flock"
 import { git, gitRemote } from "./fixture/git"
 import { tmpdir } from "./fixture/tmpdir"
 import { testEffect } from "./lib/effect"
@@ -89,15 +87,14 @@ describe("RepositoryCache", () => {
 })
 
 function cacheLayer(root: string) {
-  const dependencies = Layer.mergeAll(
-    Global.layerWith({ state: path.join(root, "state"), repos: path.join(root, "repos") }),
-    FSUtil.defaultLayer,
-  )
-  return RepositoryCache.layer.pipe(
-    Layer.provide(EffectFlock.layer.pipe(Layer.provide(dependencies))),
-    Layer.provide(Git.defaultLayer),
-    Layer.provide(dependencies),
-  )
+  return LayerNode.buildLayer(RepositoryCache.node, {
+    replacements: [
+      LayerNode.replace(
+        Global.node,
+        Global.layerWith({ state: path.join(root, "state"), repos: path.join(root, "repos") }),
+      ),
+    ],
+  })
 }
 
 function withRemote<A, E, R>(body: (fixture: Awaited<ReturnType<typeof gitRemote>>) => Effect.Effect<A, E, R>) {