diff --git a/packages/opencode/src/acp/service.ts b/packages/opencode/src/acp/service.ts
index 63d075f3fc..7257efa765 100644
--- a/packages/opencode/src/acp/service.ts
+++ b/packages/opencode/src/acp/service.ts
@@ -577,20 +577,17 @@ function makeSessionService() {
 
 function makeDirectoryService(sdk: OpencodeClient) {
   return ManagedRuntime.make(
-    AppNodeBuilder.build(
-      Directory.node,
+    AppNodeBuilder.build(Directory.node, [
       [
-        [
-          Directory.loaderNode,
-          Layer.succeed(
-            Directory.Loader,
-            Directory.Loader.of({
-              load: (directory) => request(() => loadDirectorySnapshot(sdk, directory), "directory"),
-            }),
-          ),
-        ],
+        Directory.loaderNode,
+        Layer.succeed(
+          Directory.Loader,
+          Directory.Loader.of({
+            load: (directory) => request(() => loadDirectorySnapshot(sdk, directory), "directory"),
+          }),
+        ),
       ],
-    ),
+    ]),
   ).runSync(Directory.Service.use((service) => Effect.succeed(service)))
 }
 
diff --git a/packages/opencode/src/effect/app-runtime.ts b/packages/opencode/src/effect/app-runtime.ts
index 5048bbf501..437e6a3493 100644
--- a/packages/opencode/src/effect/app-runtime.ts
+++ b/packages/opencode/src/effect/app-runtime.ts
@@ -108,10 +108,7 @@ export const AppLayer = AppNodeBuilder.build(
     SessionShare.node,
   ]),
   [[InstanceStore.bootstrapNode, InstanceBootstrap.node]],
-).pipe(
-  Layer.provideMerge(AppNodeBuilder.build(Ripgrep.node)),
-  Layer.provideMerge(Observability.layer),
-)
+).pipe(Layer.provideMerge(AppNodeBuilder.build(Ripgrep.node)), Layer.provideMerge(Observability.layer))
 
 const rt = ManagedRuntime.make(AppLayer, { memoMap })
 type Runtime = Pick<typeof rt, "runSync" | "runPromise" | "runPromiseExit" | "runFork" | "runCallback" | "dispose">
diff --git a/packages/opencode/test/config/tui.test.ts b/packages/opencode/test/config/tui.test.ts
index d00b4a4ad6..cc43cf4e55 100644
--- a/packages/opencode/test/config/tui.test.ts
+++ b/packages/opencode/test/config/tui.test.ts
@@ -71,12 +71,16 @@ const withPlatform = <A, E, R>(platform: typeof process.platform, self: Effect.E
 
 const getTuiConfig = (directory: string) =>
   TuiConfig.Service.use((svc) => svc.get()).pipe(
-    Effect.provide(AppNodeBuilder.build(TuiConfig.node).pipe(Layer.provide(Layer.succeed(CurrentWorkingDirectory, directory)))),
+    Effect.provide(
+      AppNodeBuilder.build(TuiConfig.node).pipe(Layer.provide(Layer.succeed(CurrentWorkingDirectory, directory))),
+    ),
   )
 
 const getTuiPluginOrigins = (directory: string) =>
   TuiConfig.Service.use((svc) => svc.pluginOrigins()).pipe(
-    Effect.provide(AppNodeBuilder.build(TuiConfig.node).pipe(Layer.provide(Layer.succeed(CurrentWorkingDirectory, directory)))),
+    Effect.provide(
+      AppNodeBuilder.build(TuiConfig.node).pipe(Layer.provide(Layer.succeed(CurrentWorkingDirectory, directory))),
+    ),
   )
 
 it.instance("keeps server and tui plugin merge semantics aligned", () =>