chore: generate

packages/opencode/src/mcp/catalog.ts

@@ -72,7 +72,8 @@ export function convertTool(mcpTool: MCPToolDef, client: Client, timeout?: numbe
             .filter((text) => text.trim())
             .join("\n\n") || "MCP tool returned an error",
         )
-      if (result.content.length > 0 || result.structuredContent === undefined || result.structuredContent === null) return result
+      if (result.content.length > 0 || result.structuredContent === undefined || result.structuredContent === null)
+        return result
       return {
         ...result,
         content: [{ type: "text" as const, text: JSON.stringify(result.structuredContent) }],

packages/opencode/test/mcp/catalog.test.ts

@@ -44,5 +44,4 @@ describe("McpCatalog.convertTool", () => {
       content: [{ type: "text", text: JSON.stringify(structuredContent) }],
     })
   })
-
 })

packages/opencode/test/server/httpapi-instance-context.test.ts

@@ -44,14 +44,7 @@ const testStateLayer = Layer.effectDiscard(
 
 const workspaceLayer = workspaceLayerWithRuntimeFlags({ experimentalWorkspaces: true })
 
-const it = testEffect(
+const it = testEffect(Layer.mergeAll(testStateLayer, NodeHttpServer.layerTest, NodeServices.layer, workspaceLayer))
-  Layer.mergeAll(
-    testStateLayer,
-    NodeHttpServer.layerTest,
-    NodeServices.layer,
-    workspaceLayer,
-  ),
-)
 
 const instanceContextTestLayer = Layer.mergeAll(
   instanceContextLayer,

packages/opencode/test/server/httpapi-promptasync-context.test.ts

@@ -49,14 +49,7 @@ const testStateLayer = Layer.effectDiscard(
 
 const workspaceLayer = workspaceLayerWithRuntimeFlags({ experimentalWorkspaces: true })
 
-const it = testEffect(
+const it = testEffect(Layer.mergeAll(testStateLayer, NodeHttpServer.layerTest, NodeServices.layer, workspaceLayer))
-  Layer.mergeAll(
-    testStateLayer,
-    NodeHttpServer.layerTest,
-    NodeServices.layer,
-    workspaceLayer,
-  ),
-)
 
 const instanceContextTestLayer = Layer.mergeAll(
   instanceContextLayer,

packages/opencode/test/server/httpapi-sdk.test.ts

@@ -36,9 +36,7 @@ const appLayer = AppNodeBuilder.build(
   LayerNode.group([FSUtil.node, CrossSpawnSpawner.node, InstanceStore.node, Database.node, SessionNs.node]),
   [[InstanceStore.bootstrapNode, noopBootstrapLayer]],
 )
-const it = testEffect(
+const it = testEffect(Layer.mergeAll(appLayer, httpApiLayer))
-  Layer.mergeAll(appLayer, httpApiLayer),
-)
 
 const original = {
   OPENCODE_SERVER_PASSWORD: Flag.OPENCODE_SERVER_PASSWORD,

packages/opencode/test/server/httpapi-session.test.ts

@@ -58,9 +58,7 @@ const httpApiLayer = servedRoutes.pipe(
   Layer.provideMerge(NodeHttpServer.layerTest),
   Layer.provideMerge(NodeServices.layer),
 )
-const it = testEffect(
+const it = testEffect(Layer.mergeAll(appLayer, httpApiLayer))
-  Layer.mergeAll(appLayer, httpApiLayer),
-)
 
 function pathFor(path: string, params: Record<string, string>) {
   return Object.entries(params).reduce((result, [key, value]) => result.replace(`:${key}`, value), path)

packages/opencode/test/server/httpapi-workspace.test.ts

@@ -26,19 +26,10 @@ import { httpApiLayer, requestInDirectory } from "./httpapi-layer"
 
 const originalWorkspaces = Flag.OPENCODE_EXPERIMENTAL_WORKSPACES
 const appLayer = AppNodeBuilder.build(
-  LayerNode.group([
+  LayerNode.group([Project.node, Session.node, Workspace.node, InstanceStore.node, Database.node, Ripgrep.node]),
-    Project.node,
-    Session.node,
-    Workspace.node,
-    InstanceStore.node,
-    Database.node,
-    Ripgrep.node,
-  ]),
   [[InstanceStore.bootstrapNode, InstanceBootstrap.node]],
 )
-const it = testEffect(
+const it = testEffect(Layer.mergeAll(appLayer, httpApiLayer))
-  Layer.mergeAll(appLayer, httpApiLayer),
-)
 
 function request(path: string, directory: string, init: RequestInit = {}) {
   return requestInDirectory(path, directory, init)

packages/opencode/test/server/session-list.test.ts

@@ -14,10 +14,9 @@ import { testEffect } from "../lib/effect"
 import { RuntimeFlags } from "@/effect/runtime-flags"
 
 const layer = (experimentalWorkspaces: boolean) =>
-  AppNodeBuilder.build(
+  AppNodeBuilder.build(LayerNode.group([Database.node, SessionNs.node, SessionProjector.node]), [
-    LayerNode.group([Database.node, SessionNs.node, SessionProjector.node]),
+    [RuntimeFlags.node, RuntimeFlags.layer({ experimentalWorkspaces })],
-    [[RuntimeFlags.node, RuntimeFlags.layer({ experimentalWorkspaces })]],
+  ])
-  )
 const it = testEffect(layer(false))
 const itWorkspaces = testEffect(layer(true))