fix: tests

Author: rekram1-node

packages/opencode/src/server/routes/instance/httpapi/middleware/error.ts

@@ -5,53 +5,54 @@ import { iife } from "@/util/iife"
 import { NamedError } from "@opencode-ai/core/util/error"
 import * as Log from "@opencode-ai/core/util/log"
 import { Cause, Effect } from "effect"
-import { HttpRouter, HttpServerError, HttpServerResponse } from "effect/unstable/http"
+import { HttpRouter, HttpServerError, HttpServerRespondable, HttpServerResponse } from "effect/unstable/http"
 
 const log = Log.create({ service: "server" })
 
 // Keep typed HttpApi failures on their declared error path; this boundary only replaces defect-only empty 500s.
 export const errorLayer = HttpRouter.middleware<{ handles: unknown }>()((effect) =>
   effect.pipe(
-    Effect.catchCauseIf(
-      (cause) => Cause.hasDies(cause),
-      (cause) => {
-        const error = Cause.squash(cause)
-        if (HttpServerResponse.isHttpServerResponse(error)) return Effect.succeed(error)
-        if (HttpServerError.isHttpServerError(error))
-          return HttpServerError.causeResponse(cause).pipe(Effect.map((response) => response[0]))
+    Effect.catchCause((cause) => {
+      const defect = cause.reasons.filter(Cause.isDieReason).find((reason) => {
+        if (HttpServerResponse.isHttpServerResponse(reason.defect)) return false
+        if (HttpServerError.isHttpServerError(reason.defect)) return false
+        if (HttpServerRespondable.isRespondable(reason.defect)) return false
+        return true
+      })
+      if (!defect) return Effect.failCause(cause)
 
-        log.error("failed", { error, cause: Cause.pretty(cause) })
+      const error = defect.defect
+      log.error("failed", { error, cause: Cause.pretty(cause) })
 
-        if (error instanceof NamedError) {
-          return Effect.succeed(
-            HttpServerResponse.jsonUnsafe(error.toObject(), {
-              status: iife(() => {
-                if (error instanceof NotFoundError) return 404
-                if (error instanceof Provider.ModelNotFoundError) return 400
-                if (error.name === "ProviderAuthValidationFailed") return 400
-                if (error.name.startsWith("Worktree")) return 400
-                return 500
-              }),
-            }),
-          )
-        }
-        if (error instanceof Session.BusyError) {
-          return Effect.succeed(
-            HttpServerResponse.jsonUnsafe(new NamedError.Unknown({ message: error.message }).toObject(), {
-              status: 400,
+      if (error instanceof NamedError) {
+        return Effect.succeed(
+          HttpServerResponse.jsonUnsafe(error.toObject(), {
+            status: iife(() => {
+              if (error instanceof NotFoundError) return 404
+              if (error instanceof Provider.ModelNotFoundError) return 400
+              if (error.name === "ProviderAuthValidationFailed") return 400
+              if (error.name.startsWith("Worktree")) return 400
+              return 500
             }),
-          )
-        }
-
+          }),
+        )
+      }
+      if (error instanceof Session.BusyError) {
         return Effect.succeed(
-          HttpServerResponse.jsonUnsafe(
-            new NamedError.Unknown({
-              message: error instanceof Error && error.stack ? error.stack : String(error),
-            }).toObject(),
-            { status: 500 },
-          ),
+          HttpServerResponse.jsonUnsafe(new NamedError.Unknown({ message: error.message }).toObject(), {
+            status: 400,
+          }),
         )
-      },
-    ),
+      }
+
+      return Effect.succeed(
+        HttpServerResponse.jsonUnsafe(
+          new NamedError.Unknown({
+            message: error instanceof Error && error.stack ? error.stack : String(error),
+          }).toObject(),
+          { status: 500 },
+        ),
+      )
+    }),
   ),
 ).layer