effect 4.0.0-beta.51 → 4.0.0-beta.53

package/dist/unstable/workflow/Activity.js

@@ -1,8 +1,8 @@
 import * as Cause from "../../Cause.js";
 import * as Context from "../../Context.js";
 import * as Effect from "../../Effect.js";
+import * as Effectable from "../../Effectable.js";
 import { dual } from "../../Function.js";
-import { PipeInspectableProto, YieldableProto } from "../../internal/core.js";
 import * as Schedule from "../../Schedule.js";
 import * as Schema from "../../Schema.js";
 import * as DurableDeferred from "./DurableDeferred.js";
@@ -22,8 +22,12 @@ export const make = options => {
   let execute;
   const executeWithoutInterrupt = retryOnInterrupt(options.name, options.interruptRetryPolicy)(options.execute);
   const self = {
-    ...PipeInspectableProto,
-    ...YieldableProto,
+    ...Effectable.Prototype({
+      label: "Activity",
+      evaluate(_) {
+        return execute;
+      }
+    }),
     [TypeId]: TypeId,
     name: options.name,
     successSchema,
@@ -46,10 +50,7 @@ export const make = options => {
     executeEncoded: Effect.matchEffect(executeWithoutInterrupt, {
       onFailure: error => Effect.flatMap(Effect.orDie(Schema.encodeEffect(errorSchemaJson)(error)), Effect.fail),
       onSuccess: value => Effect.orDie(Schema.encodeEffect(successSchemaJson)(value))
-    }),
-    asEffect() {
-      return execute;
-    }
+    })
   };
   execute = makeExecute(self);
   return self;

package/dist/unstable/workflow/Activity.js.map

@@ -1 +1 @@
-{"version":3,"file":"Activity.js","names":["Cause","Context","Effect","dual","PipeInspectableProto","YieldableProto","Schedule","Schema","DurableDeferred","makeHashDigest","Workflow","TypeId","make","options","successSchema","success","Void","errorSchema","error","Never","successSchemaJson","toCodecJson","errorSchemaJson","execute","executeWithoutInterrupt","retryOnInterrupt","name","interruptRetryPolicy","self","exitSchema","Exit","Defect","annotations","empty","annotate","tag","value","add","annotateMerge","context","merge","executeEncoded","matchEffect","onFailure","flatMap","orDie","encodeEffect","fail","onSuccess","asEffect","makeExecute","exponential","pipe","either","spaced","recurs","satisfiesInputType","while","meta","succeed","hasInterrupts","input","policy","effect","sandbox","retry","catch","cause","failCause","die","suspend","attempt","provideService","CurrentAttempt","Reference","defaultValue","idempotencyKey","fnUntraced","instance","InstanceTag","key","executionId","includeAttempt","raceAll","activities","Union","map","activity","effects","EngineTag","Service","engine","annotateCurrentSpan","result","wrapActivityResult","activityExecute","_","_tag","exit","withSpan","captureStackTrace"],"sources":["../../../src/unstable/workflow/Activity.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Activity.js","names":["Cause","Context","Effect","Effectable","dual","Schedule","Schema","DurableDeferred","makeHashDigest","Workflow","TypeId","make","options","successSchema","success","Void","errorSchema","error","Never","successSchemaJson","toCodecJson","errorSchemaJson","execute","executeWithoutInterrupt","retryOnInterrupt","name","interruptRetryPolicy","self","Prototype","label","evaluate","_","exitSchema","Exit","Defect","annotations","empty","annotate","tag","value","add","annotateMerge","context","merge","executeEncoded","matchEffect","onFailure","flatMap","orDie","encodeEffect","fail","onSuccess","makeExecute","exponential","pipe","either","spaced","recurs","satisfiesInputType","while","meta","succeed","hasInterrupts","input","policy","effect","sandbox","retry","catch","cause","failCause","die","suspend","attempt","provideService","CurrentAttempt","Reference","defaultValue","idempotencyKey","fnUntraced","instance","InstanceTag","key","executionId","includeAttempt","raceAll","activities","Union","map","activity","effects","asEffect","EngineTag","Service","engine","annotateCurrentSpan","result","wrapActivityResult","activityExecute","_tag","exit","withSpan","captureStackTrace"],"sources":["../../../src/unstable/workflow/Activity.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "effect",
   "type": "module",
-  "version": "4.0.0-beta.51",
+  "version": "4.0.0-beta.53",
   "license": "MIT",
   "description": "The missing standard library for TypeScript, for writing production-grade software.",
   "homepage": "https://effect.website",

package/src/Data.ts

@@ -962,7 +962,7 @@ export const taggedEnum: {
         } else if (tag === "$match") {
           return taggedMatch
         }
-        return (props: any) => ({ _tag: tag, ...props })
+        return (props: any) => ({ ...props, _tag: tag })
       }
     }
   ) as any

package/src/Effect.ts

@@ -79,6 +79,7 @@ import type { Fiber } from "./Fiber.ts"
 import type * as Filter from "./Filter.ts"
 import { constant, dual, type LazyArg } from "./Function.ts"
 import type { TypeLambda } from "./HKT.ts"
+import type { Inspectable } from "./Inspectable.ts"
 import * as core from "./internal/core.ts"
 import * as internal from "./internal/effect.ts"
 import * as internalExecutionPlan from "./internal/executionPlan.ts"
@@ -169,7 +170,9 @@ const TypeId = core.EffectTypeId
  * @since 2.0.0
  * @category Models
  */
-export interface Effect<out A, out E = never, out R = never> extends Pipeable, Yieldable<Effect<A, E, R>, A, E, R> {
+export interface Effect<out A, out E = never, out R = never>
+  extends Pipeable, Inspectable, Yieldable<Effect<A, E, R>, A, E, R>
+{
   readonly [TypeId]: Variance<A, E, R>
   [Unify.typeSymbol]?: unknown
   [Unify.unifySymbol]?: EffectUnify<this>

package/src/Effectable.ts

@@ -0,0 +1,47 @@
+/**
+ * @since 4.0.0
+ */
+import type * as Effect from "./Effect.ts"
+import type * as Fiber from "./Fiber.ts"
+import { evaluate, makePrimitiveProto } from "./internal/core.ts"
+
+/**
+ * Create a low-level `Effect` prototype.
+ *
+ * When the effect is evaluated, it will call `evaluate` with the current fiber.
+ *
+ * @since 4.0.0
+ * @category Prototypes
+ */
+export const Prototype = <A extends Effect.Effect<any, any, any>>(options: {
+  readonly label: string
+  readonly evaluate: (
+    this: A,
+    fiber: Fiber.Fiber<any, any>
+  ) => Effect.Effect<Effect.Success<A>, Effect.Error<A>, Effect.Services<A>>
+}): Effect.Effect<Effect.Success<A>, Effect.Error<A>, Effect.Services<A>> =>
+  makePrimitiveProto({
+    op: options.label,
+    [evaluate]: options.evaluate
+  }) as any
+
+const Base: new<A, E, R>() => Effect.Effect<A, E, R> = (() => {
+  const Base = function() {}
+  Base.prototype = Prototype({
+    label: "Effectable",
+    evaluate(_) {
+      return this.asEffect()
+    }
+  })
+  return Base as any
+})()
+
+/**
+ * An abstract class that can be extended to create an `Effect`.
+ *
+ * @since 4.0.0
+ * @category Constructors
+ */
+export abstract class Class<A, E = never, R = never> extends Base<A, E, R> {
+  abstract override asEffect(): Effect.Effect<A, E, R>
+}

package/src/Schema.ts

@@ -103,7 +103,7 @@ import * as Equivalence from "./Equivalence.ts"
 import * as Exit_ from "./Exit.ts"
 import type { Formatter } from "./Formatter.ts"
 import { format, formatPropertyKey } from "./Formatter.ts"
-import { identity } from "./Function.ts"
+import { identity, memoize } from "./Function.ts"
 import * as HashMap_ from "./HashMap.ts"
 import * as HashSet_ from "./HashSet.ts"
 import * as core from "./internal/core.ts"
@@ -113,7 +113,6 @@ import * as InternalEquivalence from "./internal/schema/equivalence.ts"
 import * as InternalStandard from "./internal/schema/representation.ts"
 import * as InternalSchema from "./internal/schema/schema.ts"
 import { SchemaError } from "./internal/schema/schema.ts"
-import * as InternalToCodec from "./internal/schema/to-codec.ts"
 import * as JsonPatch from "./JsonPatch.ts"
 import * as JsonSchema from "./JsonSchema.ts"
 import { remainder } from "./Number.ts"
@@ -1995,7 +1994,7 @@ export interface TemplateLiteralParser<Parts extends TemplateLiteral.Parts> exte
 export function TemplateLiteralParser<const Parts extends TemplateLiteral.Parts>(
   parts: Parts
 ): TemplateLiteralParser<Parts> {
-  return make(templateLiteralFromParts(parts).asTemplateLiteralParser(), { parts: [...parts] })
+  return make(templateLiteralFromParts(parts).asTemplateLiteralParser(), { parts })
 }
 
 /**
@@ -4930,9 +4929,8 @@ export function instanceOf<C extends abstract new(...args: any) => any, Iso = In
  * Used when building low-level AST transformations that bridge two schema types.
  *
  * @since 4.0.0
- * @experimental
  */
-export function link<T>() { // TODO: better name
+export function link<T>() {
   return <To extends Top>(
     encodeTo: To,
     transformation: {
@@ -11496,7 +11494,66 @@ export function toJsonSchemaDocument(schema: Top, options?: ToJsonSchemaOptions)
  * @since 4.0.0
  */
 export function toCodecJson<T, E, RD, RE>(schema: Codec<T, E, RD, RE>): Codec<T, Json, RD, RE> {
-  return make(InternalToCodec.toCodecJson(schema.ast))
+  return make(toCodecJsonTop(schema.ast))
+}
+
+const toCodecJsonTop = AST.toCodec((ast) => {
+  const out = toCodecJsonBase(ast, toCodecJsonTop)
+  return out !== ast && AST.isOptional(ast) ? AST.optionalKeyLastLink(out) : out
+})
+
+function toCodecJsonBase(ast: AST.AST, recur: (ast: AST.AST) => AST.AST): AST.AST {
+  switch (ast._tag) {
+    case "Declaration": {
+      const getLink = ast.annotations?.toCodecJson ?? ast.annotations?.toCodec
+      if (Predicate.isFunction(getLink)) {
+        const tps = AST.isDeclaration(ast)
+          ? ast.typeParameters.map((tp) => InternalSchema.make(AST.toEncoded(tp)))
+          : []
+        const link = getLink(tps)
+        const to = recur(link.to)
+        return AST.replaceEncoding(ast, to === link.to ? [link] : [new AST.Link(to, link.transformation)])
+      }
+      return AST.replaceEncoding(ast, [AST.unknownToNull])
+    }
+    case "Unknown":
+    case "ObjectKeyword":
+      return AST.replaceEncoding(ast, [AST.unknownToJson])
+    case "Undefined":
+    case "Void":
+    case "Literal":
+    case "Number":
+      return ast.toCodecJson()
+    case "UniqueSymbol":
+    case "Symbol":
+    case "BigInt":
+      return ast.toCodecStringTree()
+    case "Objects": {
+      if (ast.propertySignatures.some((ps) => typeof ps.name !== "string")) {
+        throw new globalThis.Error("Objects property names must be strings", { cause: ast })
+      }
+      return ast.recur(recur)
+    }
+    case "Union": {
+      const sortedTypes = InternalSchema.jsonReorder(ast.types)
+      if (sortedTypes !== ast.types) {
+        return new AST.Union(
+          sortedTypes,
+          ast.mode,
+          ast.annotations,
+          ast.checks,
+          ast.encoding,
+          ast.context
+        ).recur(recur)
+      }
+      return ast.recur(recur)
+    }
+    case "Arrays":
+    case "Suspend":
+      return ast.recur(recur)
+  }
+  // `Schema.Any` is used as an escape hatch
+  return ast
 }
 
 /**
@@ -11507,7 +11564,32 @@ export function toCodecJson<T, E, RD, RE>(schema: Codec<T, E, RD, RE>): Codec<T,
  * @since 4.0.0
  */
 export function toCodecIso<S extends Top>(schema: S): Codec<S["Type"], S["Iso"]> {
-  return make(InternalToCodec.toCodecIso(AST.toType(schema.ast)))
+  return make(toCodecIsoTop(AST.toType(schema.ast)))
+}
+
+const toCodecIsoTop = memoize((ast: AST.AST): AST.AST => {
+  const out = toCodecIsoBase(ast, toCodecIsoTop)
+  return out !== ast && AST.isOptional(ast) ? AST.optionalKeyLastLink(out) : out
+})
+
+function toCodecIsoBase(ast: AST.AST, recur: (ast: AST.AST) => AST.AST): AST.AST {
+  switch (ast._tag) {
+    case "Declaration": {
+      const getLink = ast.annotations?.toCodecIso ?? ast.annotations?.toCodec
+      if (Predicate.isFunction(getLink)) {
+        const link = getLink(ast.typeParameters.map((tp) => InternalSchema.make(tp)))
+        const to = recur(link.to)
+        return AST.replaceEncoding(ast, to === link.to ? [link] : [new AST.Link(to, link.transformation)])
+      }
+      return ast
+    }
+    case "Arrays":
+    case "Objects":
+    case "Union":
+    case "Suspend":
+      return ast.recur(recur)
+  }
+  return ast
 }
 
 /**
@@ -11546,11 +11628,13 @@ export function toCodecStringTree<T, E, RD, RE>(
   schema: Codec<T, E, RD, RE>,
   options?: { readonly keepDeclarations?: boolean | undefined }
 ): Codec<T, unknown, RD, RE> {
-  if (options?.keepDeclarations === true) {
-    return make(toCodecEnsureArray(serializerStringTreeKeepDeclarations(schema.ast)))
-  } else {
-    return make(toCodecEnsureArray(serializerStringTree(schema.ast)))
-  }
+  return make(
+    toCodecEnsureArray(
+      options?.keepDeclarations === true
+        ? serializerStringTreeKeepDeclarations(schema.ast)
+        : serializerStringTree(schema.ast)
+    )
+  )
 }
 
 type XmlEncoderOptions = {
@@ -11683,7 +11767,7 @@ function getStringTreePriority(ast: AST.AST): number {
   }
 }
 
-const treeReorder = InternalToCodec.makeReorder(getStringTreePriority)
+const treeReorder = InternalSchema.makeReorder(getStringTreePriority)
 
 function serializerTree(
   ast: AST.AST,

package/src/index.ts

@@ -1000,6 +1000,11 @@ export * as Duration from "./Duration.ts"
  */
 export * as Effect from "./Effect.ts"
 
+/**
+ * @since 4.0.0
+ */
+export * as Effectable from "./Effectable.ts"
+
 /**
  * Encoding & decoding for Base64 (RFC4648), Base64Url, and Hex.
  *
@@ -3528,6 +3533,7 @@ export * as SchemaAST from "./SchemaAST.ts"
  * - Parse/stringify JSON → {@link parseJson}, {@link stringifyJson}
  * - Encode/decode Base64 → {@link encodeBase64}, {@link decodeBase64}, {@link decodeBase64String}
  * - Encode/decode Hex → {@link encodeHex}, {@link decodeHex}, {@link decodeHexString}
+ * - Encode/decode URI components → {@link encodeUriComponent}, {@link decodeUriComponent}
  * - Parse DateTime → {@link dateTimeUtcFromInput}
  * - Decode/encode FormData → {@link decodeFormData}, {@link encodeFormData}
  * - Decode/encode URLSearchParams → {@link decodeURLSearchParams}, {@link encodeURLSearchParams}
@@ -3795,6 +3801,8 @@ export * as SchemaRepresentation from "./SchemaRepresentation.ts"
  * - Wrap nullable/optional as Option → {@link optionFromNullOr}, {@link optionFromOptionalKey}, {@link optionFromOptional}
  * - Parse URLs → {@link urlFromString}
  * - Base64 ↔ Uint8Array → {@link uint8ArrayFromBase64String}
+ * - Base64 ↔ string → {@link stringFromBase64String}
+ * - URI component ↔ string → {@link stringFromUriComponent}
  * - JSON string ↔ unknown → {@link fromJsonString}
  * - FormData/URLSearchParams ↔ unknown → {@link fromFormData}, {@link fromURLSearchParams}
  * - Check if a value is a Transformation → {@link isTransformation}

package/src/internal/effect.ts

@@ -5307,7 +5307,7 @@ class Latch implements _Latch.Latch {
     this.isOpen = true
     return this.scheduleUnsafe(fiber)
   })
-  release = withFiber<boolean>((fiber) => this.open ? succeedFalse : this.scheduleUnsafe(fiber))
+  release = withFiber<boolean>((fiber) => this.isOpen ? succeedFalse : this.scheduleUnsafe(fiber))
   openUnsafe() {
     if (this.isOpen) return false
     this.isOpen = true

package/src/internal/schema/representation.ts

@@ -11,7 +11,6 @@ import * as AST from "../../SchemaAST.ts"
 import type * as SchemaRepresentation from "../../SchemaRepresentation.ts"
 import * as InternalAnnotations from "./annotations.ts"
 import * as InternalSchema from "./schema.ts"
-import * as InternalToCodec from "./to-codec.ts"
 
 /** @internal */
 export function fromAST(ast: AST.AST): SchemaRepresentation.Document {
@@ -213,7 +212,7 @@ export function fromASTs(asts: readonly [AST.AST, ...Array<AST.AST>]): SchemaRep
           ...annotations
         }
       case "Union": {
-        const types = InternalToCodec.jsonReorder(last.types)
+        const types = InternalSchema.jsonReorder(last.types)
         return {
           _tag: last._tag,
           types: types.map((ast) => recur(ast)),

package/src/internal/schema/schema.ts

@@ -42,6 +42,7 @@ export function make<S extends Schema.Top>(ast: S["ast"], options?: object): S {
 /** @internal */
 export const SchemaErrorTypeId = "~effect/Schema/SchemaError"
 
+// not internal
 export class SchemaError {
   readonly [SchemaErrorTypeId] = SchemaErrorTypeId
   readonly _tag = "SchemaError"
@@ -57,3 +58,45 @@ export class SchemaError {
     return `SchemaError(${this.message})`
   }
 }
+
+/** @internal */
+export const jsonReorder = makeReorder(getJsonPriority)
+
+function getJsonPriority(ast: AST.AST): number {
+  switch (ast._tag) {
+    case "BigInt":
+    case "Symbol":
+    case "UniqueSymbol":
+      return 0
+    default:
+      return 1
+  }
+}
+
+/** @internal */
+export function makeReorder(getPriority: (ast: AST.AST) => number) {
+  return (types: ReadonlyArray<AST.AST>): ReadonlyArray<AST.AST> => {
+    // Create a map of original indices for O(1) lookup
+    const indexMap = new Map<AST.AST, number>()
+    for (let i = 0; i < types.length; i++) {
+      indexMap.set(AST.toEncoded(types[i]), i)
+    }
+
+    // Create a sorted copy of the types array
+    const sortedTypes = [...types].sort((a, b) => {
+      a = AST.toEncoded(a)
+      b = AST.toEncoded(b)
+      const pa = getPriority(a)
+      const pb = getPriority(b)
+      if (pa !== pb) return pa - pb
+      // If priorities are equal, maintain original order (stable sort)
+      return indexMap.get(a)! - indexMap.get(b)!
+    })
+
+    // Check if order changed by comparing arrays
+    const orderChanged = sortedTypes.some((ast, index) => ast !== types[index])
+
+    if (!orderChanged) return types
+    return sortedTypes
+  }
+}

package/src/testing/TestClock.ts

@@ -235,7 +235,7 @@ export const make = Effect.fnUntraced(function*(
   }
 
   function currentTimeNanosUnsafe(): bigint {
-    return BigInt(currentTimestamp * 1000000)
+    return BigInt(Math.floor(currentTimestamp * 1000000))
   }
 
   const currentTimeMillis = Effect.sync(currentTimeMillisUnsafe)

package/src/unstable/ai/McpServer.ts

@@ -383,6 +383,14 @@ export const run: (options: {
     const initializePayload = getInitializedClient(clientSessions, client.id, headers)
     const isInitialize = rpc._tag === "initialize"
     if (!isInitialize && !initializePayload) {
+      const fiber = Fiber.getCurrent()!
+      const httpRequest = Context.getOrUndefined(fiber.context, HttpServerRequest.HttpServerRequest)
+      if (httpRequest) {
+        appendPreResponseHandlerUnsafe(
+          httpRequest,
+          () => Effect.succeed(HttpServerResponse.empty({ status: 404 }))
+        )
+      }
       return Effect.die(new Error(`Mcp-Session-Id does not exist`))
     }
     return Effect.provideService(

package/src/unstable/cli/index.ts

@@ -25,6 +25,8 @@ export * as CliOutput from "./CliOutput.ts"
 export * as Command from "./Command.ts"
 
 /**
+ * Shell completion descriptors and script generation for the unstable CLI API.
+ *
  * @since 4.0.0
  */
 export * as Completions from "./Completions.ts"

package/src/unstable/cluster/ClusterWorkflowEngine.ts

@@ -472,7 +472,7 @@ export const make = Effect.gen(function*() {
             activities.set(activityId, { activity, context: services })
             const latch = activityLatches.get(activityId)
             if (latch) {
-              yield* latch.release
+              yield* latch.open
               activityLatches.delete(activityId)
             }
           }

package/src/unstable/http/HttpIncomingMessage.ts

@@ -46,10 +46,11 @@ export interface HttpIncomingMessage<E = unknown> extends Inspectable.Inspectabl
  * @category schema
  */
 export const schemaBodyJson = <S extends Schema.Top>(schema: S, options?: ParseOptions | undefined) => {
-  const decode = Schema.decodeEffect(Schema.toCodecJson(schema).annotate({ options }))
+  const decode = Schema.decodeEffect(Schema.toCodecJson(schema))
   return <E>(
     self: HttpIncomingMessage<E>
-  ): Effect.Effect<S["Type"], E | Schema.SchemaError, S["DecodingServices"]> => Effect.flatMap(self.json, decode)
+  ): Effect.Effect<S["Type"], E | Schema.SchemaError, S["DecodingServices"]> =>
+    Effect.flatMap(self.json, (u) => decode(u, options))
 }
 
 /**
@@ -67,11 +68,10 @@ export const schemaBodyUrlParams = <
 ) => {
   const decode = UrlParams.schemaRecord.pipe(
     Schema.decodeTo(schema),
-    Schema.annotate({ options }),
     Schema.decodeEffect
   )
   return <E>(self: HttpIncomingMessage<E>): Effect.Effect<A, E | Schema.SchemaError, RD> =>
-    Effect.flatMap(self.urlParamsBody, decode)
+    Effect.flatMap(self.urlParamsBody, (u) => decode(u, options))
 }
 
 /**

package/src/unstable/httpapi/HttpApi.ts

@@ -255,7 +255,7 @@ export const reflect = <Id extends string, Groups extends HttpApiGroup.Any>(
 // -------------------------------------------------------------------------------------
 
 const extractResponseContent = (
-  schemas: readonly [Schema.Top, ...Array<Schema.Top>],
+  schemas: Array<Schema.Top>,
   getStatus: (ast: AST.AST) => number
 ): ReadonlyMap<number, [Schema.Top, ...Array<Schema.Top>]> => {
   const map = new Map<number, [Schema.Top, ...Array<Schema.Top>]>()

package/src/unstable/httpapi/HttpApiBuilder.ts

@@ -36,6 +36,7 @@ import * as Multipart from "../http/Multipart.ts"
 import * as UrlParams from "../http/UrlParams.ts"
 import type * as HttpApi from "./HttpApi.ts"
 import * as HttpApiEndpoint from "./HttpApiEndpoint.ts"
+import { HttpApiSchemaError } from "./HttpApiError.ts"
 import type * as HttpApiGroup from "./HttpApiGroup.ts"
 import * as HttpApiMiddleware from "./HttpApiMiddleware.ts"
 import * as HttpApiSchema from "./HttpApiSchema.ts"
@@ -589,13 +590,13 @@ function handlerToHttpEffect(
         group
       }
       if (decodeParams) {
-        request.params = yield* decodeParams(routeContext.params)
+        request.params = yield* HttpApiSchemaError.wrap("Params", decodeParams(routeContext.params))
       }
       if (decodeHeaders) {
-        request.headers = yield* decodeHeaders(httpRequest.headers)
+        request.headers = yield* HttpApiSchemaError.wrap("Headers", decodeHeaders(httpRequest.headers))
       }
       if (decodeQuery) {
-        request.query = yield* decodeQuery(query)
+        request.query = yield* HttpApiSchemaError.wrap("Query", decodeQuery(query))
       }
       if (payloadBy) {
         const result = decodePayload(payloadBy, httpRequest, query)
@@ -603,15 +604,20 @@ function handlerToHttpEffect(
           return result
         }
         if (result !== undefined) {
-          request.payload = yield* result
+          request.payload = yield* HttpApiSchemaError.wrap("Payload", result)
         }
       }
       const response = yield* handler(request)
-      return Response.isHttpServerResponse(response) ? response : yield* encodeSuccess(response)
+      return Response.isHttpServerResponse(response)
+        ? response
+        : yield* HttpApiSchemaError.wrap("Body", encodeSuccess(response))
     })
   ).pipe(
     Effect.withErrorReporting,
-    Effect.catch((error) => Effect.orDie(encodeError(error))),
+    Effect.catch((error) => {
+      if (HttpApiSchemaError.is(error)) return Effect.die(error)
+      return Effect.orDie(encodeError(error))
+    }),
     Effect.provideContext(context)
   )
 }
@@ -719,6 +725,7 @@ function makeSuccessSchema(endpoint: HttpApiEndpoint.AnyWithProps): Schema.Encod
 
 function makeErrorSchema(endpoint: HttpApiEndpoint.AnyWithProps): Schema.Encoder<HttpServerResponse, unknown> {
   const schemas = HttpApiEndpoint.getErrorSchemas(endpoint).map(toResponseErrorSchema)
+  if (schemas.length === 0) return Schema.Never
   return schemas.length === 1 ? schemas[0] : Schema.Union(schemas)
 }
 

package/src/unstable/httpapi/HttpApiClient.ts

@@ -23,7 +23,6 @@ import * as HttpMethod from "../http/HttpMethod.ts"
 import * as UrlParams from "../http/UrlParams.ts"
 import * as HttpApi from "./HttpApi.ts"
 import * as HttpApiEndpoint from "./HttpApiEndpoint.ts"
-import type { BadRequest } from "./HttpApiError.ts"
 import type * as HttpApiGroup from "./HttpApiGroup.ts"
 import type * as HttpApiMiddleware from "./HttpApiMiddleware.ts"
 import * as HttpApiSchema from "./HttpApiSchema.ts"
@@ -32,7 +31,7 @@ import * as HttpApiSchema from "./HttpApiSchema.ts"
  * @since 4.0.0
  * @category models
  */
-export type Client<Groups extends HttpApiGroup.Any, E = BadRequest, R = never> = Simplify<
+export type Client<Groups extends HttpApiGroup.Any, E = never, R = never> = Simplify<
   & {
     readonly [Group in Extract<Groups, { readonly topLevel: false }> as HttpApiGroup.Name<Group>]: Client.Group<
       Group,
@@ -50,7 +49,7 @@ export type Client<Groups extends HttpApiGroup.Any, E = BadRequest, R = never> =
  * @since 4.0.0
  * @category models
  */
-export type ForApi<Api extends HttpApi.Any, E = BadRequest, R = never> = Api extends
+export type ForApi<Api extends HttpApi.Any, E = never, R = never> = Api extends
   HttpApi.HttpApi<infer _Id, infer Groups> ? Client<Groups, E, R> :
   never
 
@@ -405,7 +404,7 @@ export const makeWith = <ApiId extends string, Groups extends HttpApiGroup.Any,
       | undefined
     readonly baseUrl?: URL | string | undefined
   }
-): Effect.Effect<Client<Groups, BadRequest | E, R>, never, HttpApiGroup.MiddlewareClient<Groups>> => {
+): Effect.Effect<Client<Groups, E, R>, never, HttpApiGroup.MiddlewareClient<Groups>> => {
   const client: Record<string, Record<string, any>> = {}
   return makeClient(api, {
     ...options,
@@ -440,7 +439,7 @@ export const group = <
     readonly baseUrl?: URL | string | undefined
   }
 ): Effect.Effect<
-  Client.Group<Groups, GroupName, BadRequest | E, R>,
+  Client.Group<Groups, GroupName, E, R>,
   never,
   HttpApiGroup.MiddlewareClient<HttpApiGroup.WithName<Groups, GroupName>>
 > => {
@@ -480,7 +479,7 @@ export const endpoint = <
 ): Effect.Effect<
   Client.Method<
     HttpApiEndpoint.WithName<HttpApiGroup.Endpoints<HttpApiGroup.WithName<Groups, GroupName>>, EndpointName>,
-    BadRequest | E,
+    E,
     R
   >,
   never,