fix: resolve conflicts in instance-state.test.ts

Author: twhittock

packages/opencode/src/effect/instance-state.ts

@@ -60,7 +60,10 @@ export const make = <A, E = never, R = never>(
 
 export const get = <A, E, R>(self: InstanceState<A, E, R>) =>
   Effect.gen(function* () {
-    return yield* ScopedCache.get(self.cache, yield* directory)
+    const ctx = yield* context
+    return yield* ScopedCache.get(self.cache, ctx.directory).pipe(
+      Effect.provideService(InstanceRef, ctx),
+    )
   })
 
 export const use = <A, E, R, B>(self: InstanceState<A, E, R>, select: (value: A) => B) => Effect.map(get(self), select)

packages/opencode/test/effect/instance-state.test.ts

@@ -326,11 +326,11 @@ it.live("InstanceState survives deferred resume from the same instance context",
       readonly get: (gate: Deferred.Deferred<void>) => Effect.Effect<string>
     }
 
-    class Test extends Context.Service<Test, Api>()("@test/DeferredResume") {
-      static readonly layer = Layer.effect(
-        Test,
-        Effect.gen(function* () {
-          const state = yield* InstanceState.make((ctx) => Effect.sync(() => ctx.directory))
+class Test extends Context.Service<Test, Api>()("@test/DeferredResume") {
+    static readonly layer = Layer.effect(
+      Test,
+      Effect.gen(function* () {
+        const state = yield* InstanceState.make((ctx) => Effect.sync(() => ctx.directory))
 
           return Test.of({
             get: Effect.fn("Test.get")(function* (gate: Deferred.Deferred<void>) {